diff options
28 files changed, 482 insertions, 141 deletions
diff --git a/Master/texmf-dist/doc/latex/zref/README.md b/Master/texmf-dist/doc/latex/zref/README.md index f2d03255081..bb47ffdbfaf 100644 --- a/Master/texmf-dist/doc/latex/zref/README.md +++ b/Master/texmf-dist/doc/latex/zref/README.md @@ -1,6 +1,6 @@ # zref packages for LaTeX -Version: 2020-07-03 v2.32 +Version: 2022-03-08 v2.33 Package zref tries to get rid of the restriction @@ -13,7 +13,7 @@ reference scheme. ## Copyright (C) * 2007, 2009-2011 Heiko Oberdiek -* 2016-2020 Oberdiek Package Support Group +* 2016-2022 Oberdiek Package Support Group ## License LATEX Project Public License, version 1.3c or later. diff --git a/Master/texmf-dist/doc/latex/zref/zref-example-lastpage.tex b/Master/texmf-dist/doc/latex/zref/zref-example-lastpage.tex new file mode 100644 index 00000000000..1cde6ce01da --- /dev/null +++ b/Master/texmf-dist/doc/latex/zref/zref-example-lastpage.tex @@ -0,0 +1,82 @@ +%% +%% This is file `zref-example-lastpage.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `example-lastpage') +%% +%% This is a generated file. +%% +%% Project: zref +%% Version: 2022-03-08 v2.33 +%% +%% Copyright (C) +%% 2006-2012 Heiko Oberdiek +%% 2016-2022 Oberdiek Package Support Group +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% https://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainers of this work are +%% Heiko Oberdiek and the Oberdiek Package Support Group +%% https://github.com/ho-tex/zref/issues +%% +%% This work consists of the main source file zref.dtx +%% and the derived files +%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, +%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-base.tex, zref-test-runs.tex, +%% zref-test-titleref-memoir.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\documentclass{report} + +\newcounter{foo} +\renewcommand*{\thefoo}{\Alph{foo}} + +\usepackage{zref-lastpage,zref-user}[2019/11/29] + +\makeatletter +\zref@newprop{thefoo}{\thefoo} +\zref@newprop{valuefoo}{\the\value{foo}} +\zref@newprop{chapter}{\thechapter} +\zref@addprops{LastPage}{thefoo,valuefoo,chapter} +\makeatother + +\newcommand*{\foo}{% + \stepcounter{foo}% + [Current foo: \thefoo]% +} + +\begin{document} + \chapter{First chapter} + Last page is \zref{LastPage}.\\ + Last chapter is \zref[chapter]{LastPage}.\\ + Last foo is \zref[thefoo]{LastPage}.\\ + Last value of foo is \zref[valuefoo]{LastPage}.\\ + \foo + \chapter{Second chapter} + \foo\foo\foo + \chapter{Last chapter} + \foo +\end{document} +\endinput +%% +%% End of file `zref-example-lastpage.tex'. diff --git a/Master/texmf-dist/doc/latex/zref/zref-example-nextpage.tex b/Master/texmf-dist/doc/latex/zref/zref-example-nextpage.tex new file mode 100644 index 00000000000..d6261932c73 --- /dev/null +++ b/Master/texmf-dist/doc/latex/zref/zref-example-nextpage.tex @@ -0,0 +1,76 @@ +%% +%% This is file `zref-example-nextpage.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `example-nextpage') +%% +%% This is a generated file. +%% +%% Project: zref +%% Version: 2022-03-08 v2.33 +%% +%% Copyright (C) +%% 2006-2012 Heiko Oberdiek +%% 2016-2022 Oberdiek Package Support Group +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% https://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainers of this work are +%% Heiko Oberdiek and the Oberdiek Package Support Group +%% https://github.com/ho-tex/zref/issues +%% +%% This work consists of the main source file zref.dtx +%% and the derived files +%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, +%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-base.tex, zref-test-runs.tex, +%% zref-test-titleref-memoir.tex. +%% +\documentclass{book} + +\usepackage{zref-nextpage}[2019/11/29] +\znextpagesetup + {\thepage}% next page is unknown + {\thepage\ (#1)}% this page is last page + {\thepage\ $\rightarrow$ #1}% next page is known +\renewcommand*{\znonextpagename}{last page} + +\usepackage{fancyhdr} +\pagestyle{fancy} +\fancyhf{} +\fancyhead[LE,RO]{\znextpage} +\fancypagestyle{plain}{% + \fancyhf{}% + \fancyhead[LE,RO]{\znextpage}% +} + +\begin{document} +\frontmatter + \tableofcontents +\mainmatter + \chapter{Hello World} + \clearpage + \section{Last section} +\end{document} +\endinput +%% +%% End of file `zref-example-nextpage.tex'. diff --git a/Master/texmf-dist/doc/latex/zref/zref-example.tex b/Master/texmf-dist/doc/latex/zref/zref-example.tex new file mode 100644 index 00000000000..5b9c91affa4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/zref/zref-example.tex @@ -0,0 +1,168 @@ +%% +%% This is file `zref-example.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `example') +%% +%% This is a generated file. +%% +%% Project: zref +%% Version: 2022-03-08 v2.33 +%% +%% Copyright (C) +%% 2006-2012 Heiko Oberdiek +%% 2016-2022 Oberdiek Package Support Group +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% https://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainers of this work are +%% Heiko Oberdiek and the Oberdiek Package Support Group +%% https://github.com/ho-tex/zref/issues +%% +%% This work consists of the main source file zref.dtx +%% and the derived files +%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, +%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty, +%% zref-dotfill.sty, zref-env.sty, zref-hyperref.sty, +%% zref-lastpage.sty, zref-marks.sty, zref-nextpage.sty, +%% zref-pageattr.sty, zref-pagelayout.sty, zref-perpage.sty, +%% zref-runs.sty, zref-savepos.sty, zref-thepage.sty, +%% zref-titleref.sty, zref-totpages.sty, zref-user.sty, +%% zref-xr.sty, zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-base.tex, zref-test-runs.tex, +%% zref-test-titleref-memoir.tex. +%% +\documentclass{book} + +\usepackage[ngerman]{babel}% + +\usepackage[savepos,totpages,titleref,dotfill,counter,user]{zref} + +\makeatletter +\zref@newprop{chaptitle}{} +\zref@addprop{main}{chaptitle} + +\newcommand*{\ChapterStart}[2]{% + \cleardoublepage + \def\current@chapid{#1}% + \zref@setcurrent{chaptitle}{#2}% + \chapter{#2}% + \zlabel{chap:#1}% +} +\newcommand*{\ChapterStop}{% + \cleardoublepage + \zref@wrapper@immediate{% + \zref@labelbyprops{chapend:\current@chapid}{abspage}% + }% +} +\newcommand*{\ChapterPages}[1]{% + \zrefused{chap:#1}% + \zrefused{chapend:#1}% + \number\numexpr + \zref@extract{chapend:#1}{abspage}% + -\zref@extract{chap:#1}{abspage}% + +1\relax +} +\makeatother +\begin{document} +\makeatletter + +\frontmatter +\zlabel{documentstart} + +\begin{itemize} +\item + The frontmatter part has + \number\numexpr\zref@extract{chap:first}{abspage}-1\relax + ~pages. +\item + Chapter \zref{chap:first} has \ChapterPages{first} page(s). +\item + Section \zref{hello} is on the + \ifcase\numexpr + \zref@extractdefault{hello}{page}{0}% + -\zref@extractdefault{chap:first}{page}{0}% + +1\relax + ??\or first\or second\or third\or forth\fi + ~page inside its chapter. +\item + The document has + \zref[abspage]{LastPage} pages. + This number is \ifodd\ztotpages odd\else even\fi. +\item + The last page is labeled with \zpageref{LastPage}. +\item + The title of chapter \zref{chap:next} % + is ``\zref[chaptitle]{chap:next}''. +\end{itemize} + +\tableofcontents + +\mainmatter +\ChapterStart{first}{First chapter} + +\section{Test} +\zlabel{a"o} +Section \zref{a"o} on page +\zref@wrapper@babel\zref@extract{a"o}{page}. + +Text. +\newpage + +\section{Hello World} +\zlabel{hello} + +\ChapterStop + +\ChapterStart{next}{Next chapter with \emph{umlauts}: "a"o"u"s} + +The width of the first column is + \the\dimexpr \zposx{secondcol}sp - \zposx{firstcol}sp\relax,\\ +the height difference of the two baselines is + \the\dimexpr \zposy{firstcol}sp - \zposy{secondline}sp\relax:\\ +\begin{tabular}{ll} + \zsavepos{firstcol}Hello&\zsavepos{secondcol}World\\ + \zsavepos{secondline}Second line&foobar\\ +\end{tabular} + +\zrefused{firstcol} +\zrefused{secondcol} +\zrefused{secondline} + +\ChapterStop +\ChapterStart{dotfill}{Test for dotfill feature} +\newcommand*{\dftest}[1]{% + #1& + [\makebox[{#1}]{\dotfill}]& + [\makebox[{#1}]{\zdotfill}]\\ +} +\begin{tabular}{rll} +& [\verb|\dotfill|] & [\verb|\zdotfill|]\\ +\dftest{0.43em} +\dftest{0.44em} +\dftest{0.45em} +\dftest{0.87em} +\dftest{0.88em} +\dftest{0.89em} +\dftest{1.31em} +\dftest{1.32em} +\dftest{1.33em} +\end{tabular} +\ChapterStop +\end{document} +\endinput +%% +%% End of file `zref-example.tex'. diff --git a/Master/texmf-dist/doc/latex/zref/zref.pdf b/Master/texmf-dist/doc/latex/zref/zref.pdf Binary files differindex cd49923f053..3d4505c17bf 100644 --- a/Master/texmf-dist/doc/latex/zref/zref.pdf +++ b/Master/texmf-dist/doc/latex/zref/zref.pdf diff --git a/Master/texmf-dist/source/latex/zref/zref.dtx b/Master/texmf-dist/source/latex/zref/zref.dtx index a74626aa7dd..731338b70a6 100644 --- a/Master/texmf-dist/source/latex/zref/zref.dtx +++ b/Master/texmf-dist/source/latex/zref/zref.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: zref.dtx -% Version: 2020-07-03 v2.32 +% Version: 2022-03-08 v2.33 % Info: A new reference scheme for LaTeX % % Copyright (C) @@ -112,7 +112,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: zref 2020-07-03 v2.32 A new reference scheme for LaTeX (HO)} +\Msg{* Package: zref 2022-03-08 v2.33 A new reference scheme for LaTeX (HO)} \Msg{************************************************************************} \keepsilent @@ -124,11 +124,11 @@ This is a generated file. Project: zref -Version: 2020-07-03 v2.32 +Version: 2022-03-08 v2.33 Copyright (C) 2006-2012 Heiko Oberdiek - 2016-2020 Oberdiek Package Support Group + 2016-2022 Oberdiek Package Support Group This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -230,7 +230,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{zref.drv}% - [2020-07-03 v2.32 A new reference scheme for LaTeX (HO)]% + [2022-03-08 v2.33 A new reference scheme for LaTeX (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \setlength{\emergencystretch}{1em} @@ -245,7 +245,7 @@ and the derived files % \GetFileInfo{zref.drv} % % \title{The \xpackage{zref} package} -% \date{2020-07-03 v2.32} +% \date{2022-03-08 v2.33} % \author{Heiko Oberdiek\thanks % {Please report any issues at \url{https://github.com/ho-tex/zref/issues}}} % @@ -1663,7 +1663,7 @@ the height difference of the two baselines is %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2020-07-03 v2.32 A new reference scheme for LaTeX (HO)]% + [2022-03-08 v2.33 A new reference scheme for LaTeX (HO)]% % \end{macrocode} % % \subsubsection{Load basic module} @@ -1750,7 +1750,7 @@ the height difference of the two baselines is %<*base> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2020-07-03 v2.32 Module base for zref (HO)]% + [2022-03-08 v2.33 Module base for zref (HO)]% % \end{macrocode} % % \subsubsection{Utilities} @@ -2907,13 +2907,13 @@ the height difference of the two baselines is % \begin{macro}{\zref@require@unique} % Generate the counter |zref@unique| if the counter does not % already exist. +% change 2022-08-03: The counter is no longer removed from the reset, +% so that the behaviour with includeonly is improved, see issue +% https://github.com/ho-tex/zref/issues/10 % \begin{macrocode} \ZREF@Robust\def\zref@require@unique{% \@ifundefined{c@zref@unique}{% - \begingroup - \let\@addtoreset\ltx@gobbletwo \newcounter{zref@unique}% - \endgroup % \end{macrocode} % \end{macro} % @@ -2928,6 +2928,18 @@ the height difference of the two baselines is } % \end{macrocode} % \end{macro} +% To improve the behaviour if include/includeonly is used, we round the +% counter up at every include, see https://github.com/ho-tex/zref/issues/10 +% +% \begin{macrocode} +\IfFormatAtLeastTF{2020/10/01} + { + \AddToHook + {include/after} + {\setcounter{zref@unique} + {\csname fp_to_int:n\endcsname{ceil(\c@zref@unique +100,-2)}}} + }{} +% \end{macrocode} % % \subsubsection{Utilities} % @@ -3058,7 +3070,7 @@ the height difference of the two baselines is %<*user> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2020-07-03 v2.32 Module user for zref (HO)]% + [2022-03-08 v2.33 Module user for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -3149,7 +3161,7 @@ the height difference of the two baselines is %<*abspage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2020-07-03 v2.32 Module abspage for zref (HO)]% + [2022-03-08 v2.33 Module abspage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -3197,7 +3209,7 @@ the height difference of the two baselines is %<*counter> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2020-07-03 v2.32 Module counter for zref (HO)]% + [2022-03-08 v2.33 Module counter for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -3242,7 +3254,7 @@ the height difference of the two baselines is %<*lastpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2020-07-03 v2.32 Module lastpage for zref (HO)]% + [2022-03-08 v2.33 Module lastpage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \RequirePackage{zref-abspage}[2019/11/29] \RequirePackage{atveryend}[2009/12/07] @@ -3314,7 +3326,7 @@ the height difference of the two baselines is %<*thepage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2020-07-03 v2.32 Module thepage for zref (HO)]% + [2022-03-08 v2.33 Module thepage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -3389,7 +3401,7 @@ the height difference of the two baselines is %<*nextpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2020-07-03 v2.32 Module nextpage for zref (HO)]% + [2022-03-08 v2.33 Module nextpage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -3493,7 +3505,7 @@ the height difference of the two baselines is %<*totpages> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2020-07-03 v2.32 Module totpages for zref (HO)]% + [2022-03-08 v2.33 Module totpages for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -3535,7 +3547,7 @@ the height difference of the two baselines is %<*pagelayout> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pagelayout}% - [2020-07-03 v2.32 Module pagelayout for zref (HO)]% + [2022-03-08 v2.33 Module pagelayout for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -3767,7 +3779,7 @@ the height difference of the two baselines is %<*pageattr> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pageattr}% - [2020-07-03 v2.32 Module pageattr for zref (HO)]% + [2022-03-08 v2.33 Module pageattr for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -3999,7 +4011,7 @@ the height difference of the two baselines is %<*marks> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2020-07-03 v2.32 Module marks for zref (HO)]% + [2022-03-08 v2.33 Module marks for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -4105,7 +4117,7 @@ the height difference of the two baselines is %<*runs> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2020-07-03 v2.32 Module runs for zref (HO)]% + [2022-03-08 v2.33 Module runs for zref (HO)]% % \end{macrocode} % % \begin{macro}{\zruns} @@ -4137,7 +4149,7 @@ the height difference of the two baselines is %<*perpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2020-07-03 v2.32 Module perpage for zref (HO)]% + [2022-03-08 v2.33 Module perpage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -4187,6 +4199,27 @@ the height difference of the two baselines is \ZREF@org@stepcounter{#1}% } % \end{macrocode} +% +% If amstext is loaded it overwrites the definition (or we overwrite their definition) +% so we account for this by using a package hook, see +% https://github.com/ho-tex/zref/issues/11. +% \begin{macrocode} +\IfFormatAtLeastTF{2020/10/01} + { + \AddToHook{package/amstext/after} + {\def\stepcounter#1{% + \iffirstchoice@ + \ifcsname @stepcounterhook@#1\endcsname + \csname @stepcounterhook@#1\endcsname + \fi + \addtocounter{#1}\@ne + \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname \endgroup + \fi + }} + }{} +% \end{macrocode} +% +% % \cs{@stpelt} must be adapted due to the change in latex % 2015-01, see https://github.com/ho-tex/zref/issues/26 % \begin{macrocode} @@ -4319,7 +4352,7 @@ the height difference of the two baselines is %<*titleref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2020-07-03 v2.32 Module titleref for zref (HO)]% + [2022-03-08 v2.33 Module titleref for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -4732,7 +4765,7 @@ the height difference of the two baselines is %<*xr> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2020-07-03 v2.32 Module xr for zref (HO)]% + [2022-03-08 v2.33 Module xr for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -5268,7 +5301,7 @@ the height difference of the two baselines is %<*hyperref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2020-07-03 v2.32 Module hyperref for zref (HO)]% + [2022-03-08 v2.33 Module hyperref for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -5298,7 +5331,7 @@ the height difference of the two baselines is %<*savepos> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2020-07-03 v2.32 Module savepos for zref (HO)]% + [2022-03-08 v2.33 Module savepos for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -5471,7 +5504,7 @@ the height difference of the two baselines is %<*abspos> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspos}% - [2020-07-03 v2.32 Module abspos for zref (HO)]% + [2022-03-08 v2.33 Module abspos for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -6125,7 +6158,7 @@ the height difference of the two baselines is %<*dotfill> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2020-07-03 v2.32 Module dotfill for zref (HO)]% + [2022-03-08 v2.33 Module dotfill for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -6225,7 +6258,7 @@ the height difference of the two baselines is %<*env> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-env}% - [2020-07-03 v2.32 Module env for zref (HO)]% + [2022-03-08 v2.33 Module env for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -6261,7 +6294,7 @@ the height difference of the two baselines is %</env> % \end{macrocode} % -%% \section{Installation} +% \section{Installation} % % \subsection{Download} % @@ -6758,6 +6791,12 @@ the height difference of the two baselines is % \item Changed in zref-pagelayout the names of the shipout box dimensions % to adapt to the new hook management. % \end{Version} +% \begin{Version}{2022-03-08 v2.33} +% \item Avoid that amstext undoes the stepcounter patch in zref-perpage, +% https://github.com/ho-tex/zref/issues/11 +% \item Make the unique counter more robust when includeonly is used, +% https://github.com/ho-tex/zref/issues/10 +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/tex/latex/zref/zref-abspage.sty b/Master/texmf-dist/tex/latex/zref/zref-abspage.sty index 45d44427562..f75d2f8a1dc 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-abspage.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2020-07-03 v2.32 Module abspage for zref (HO)]% + [2022-03-08 v2.33 Module abspage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -65,7 +64,6 @@ }% \zref@newprop*{abspage}[0]{\the\c@abspage}% \zref@addprop\ZREF@mainlist{abspage}% -%% \section{Installation} \endinput %% %% End of file `zref-abspage.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-abspos.sty b/Master/texmf-dist/tex/latex/zref/zref-abspos.sty index fab5020f4d3..20e4e8c9b0b 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-abspos.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-abspos.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspos}% - [2020-07-03 v2.32 Module abspos for zref (HO)]% + [2022-03-08 v2.33 Module abspos for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -377,7 +376,6 @@ \let\ZREF@abspos@stock@y@top\ZREF@abspos@paper@y@top \let\ZREF@abspos@stock@y@bottom\ZREF@abspos@paper@y@bottom \let\ZREF@abspos@stock@y@center\ZREF@abspos@paper@y@center -%% \section{Installation} \endinput %% %% End of file `zref-abspos.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-base.sty b/Master/texmf-dist/tex/latex/zref/zref-base.sty index 489ff7429c4..f17e10c7ebd 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-base.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-base.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2020-07-03 v2.32 Module base for zref (HO)]% + [2022-03-08 v2.33 Module base for zref (HO)]% \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \RequirePackage{ltxcmds}[2010/12/02] \RequirePackage{infwarerr}[2010/04/08] @@ -737,15 +736,19 @@ } \ZREF@Robust\def\zref@require@unique{% \@ifundefined{c@zref@unique}{% - \begingroup - \let\@addtoreset\ltx@gobbletwo \newcounter{zref@unique}% - \endgroup \renewcommand*{\thezref@unique}{% zref@\number\c@zref@unique }% }{}% } +\IfFormatAtLeastTF{2020/10/01} + { + \AddToHook + {include/after} + {\setcounter{zref@unique} + {\csname fp_to_int:n\endcsname{ceil(\c@zref@unique +100,-2)}}} + }{} \ltx@IfUndefined{numexpr}{% \def\ZREF@number#1{\number#1}% }{% @@ -785,7 +788,6 @@ \global\let\ZREF@NewPropPageValue\relax } \let\ZREF@base@ok=Y -%% \section{Installation} \endinput %% %% End of file `zref-base.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-counter.sty b/Master/texmf-dist/tex/latex/zref/zref-counter.sty index 88667b5f433..9ebb74305ec 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-counter.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2020-07-03 v2.32 Module counter for zref (HO)]% + [2022-03-08 v2.33 Module counter for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -71,7 +70,6 @@ }% } } -%% \section{Installation} \endinput %% %% End of file `zref-counter.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty b/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty index a9c33ba7f87..f0b10c7b12e 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2020-07-03 v2.32 Module dotfill for zref (HO)]% + [2022-03-08 v2.33 Module dotfill for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -99,7 +98,6 @@ \def\ZREF@dotfill{% \cleaders\hb@xt@\dimen@{\hss\ZREF@df@dot\hss}\hfill } -%% \section{Installation} \endinput %% %% End of file `zref-dotfill.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-env.sty b/Master/texmf-dist/tex/latex/zref/zref-env.sty index 1b5702a6ab4..cbf25cd0239 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-env.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-env.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-env}% - [2020-07-03 v2.32 Module env for zref (HO)]% + [2022-03-08 v2.33 Module env for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -64,7 +63,6 @@ \fi } \def\ZREF@ENV@line#1line #2\ltx@empty#3\@nil{#2}% -%% \section{Installation} \endinput %% %% End of file `zref-env.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty b/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty index 11c54cb1953..df4d8e9d3b4 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2020-07-03 v2.32 Module hyperref for zref (HO)]% + [2022-03-08 v2.33 Module hyperref for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -56,7 +55,6 @@ \fi \ZREF@NewPropAnchor \zref@addprop\ZREF@mainlist{anchor}% -%% \section{Installation} \endinput %% %% End of file `zref-hyperref.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty b/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty index a3783e7b41b..4e9cd1a882e 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2020-07-03 v2.32 Module lastpage for zref (HO)]% + [2022-03-08 v2.33 Module lastpage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \RequirePackage{zref-abspage}[2019/11/29] \RequirePackage{atveryend}[2009/12/07] @@ -87,7 +86,6 @@ \zref@refused{#1}% \zref@iflastpage{#1}% } -%% \section{Installation} \endinput %% %% End of file `zref-lastpage.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-marks.sty b/Master/texmf-dist/tex/latex/zref/zref-marks.sty index 6f09a1ad2bf..69d570d5f94 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-marks.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-marks.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2020-07-03 v2.32 Module marks for zref (HO)]% + [2022-03-08 v2.33 Module marks for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -137,7 +136,6 @@ }% }% } -%% \section{Installation} \endinput %% %% End of file `zref-marks.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty b/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty index 2e0a1b9b487..6f38407ffef 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2020-07-03 v2.32 Module nextpage for zref (HO)]% + [2022-03-08 v2.33 Module nextpage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -135,7 +134,6 @@ }% \x } -%% \section{Installation} \endinput %% %% End of file `zref-nextpage.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty b/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty index ef8b1752290..7e5521c2b45 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pageattr}% - [2020-07-03 v2.32 Module pageattr for zref (HO)]% + [2022-03-08 v2.33 Module pageattr for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -215,7 +214,6 @@ \AfterLastShipout{% \ZREF@pa@AfterLastShipout } -%% \section{Installation} \endinput %% %% End of file `zref-pageattr.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty b/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty index f17b1070442..d335b624666 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-pagelayout}% - [2020-07-03 v2.32 Module pagelayout for zref (HO)]% + [2022-03-08 v2.33 Module pagelayout for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -226,7 +225,6 @@ \AfterLastShipout{% \ZREF@pl@AfterLastShipout } -%% \section{Installation} \endinput %% %% End of file `zref-pagelayout.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-perpage.sty b/Master/texmf-dist/tex/latex/zref/zref-perpage.sty index 904bbb522fe..68ba0f4cdf5 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-perpage.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2020-07-03 v2.32 Module perpage for zref (HO)]% + [2022-03-08 v2.33 Module perpage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -67,6 +66,19 @@ \fi \ZREF@org@stepcounter{#1}% } +\IfFormatAtLeastTF{2020/10/01} + { + \AddToHook{package/amstext/after} + {\def\stepcounter#1{% + \iffirstchoice@ + \ifcsname @stepcounterhook@#1\endcsname + \csname @stepcounterhook@#1\endcsname + \fi + \addtocounter{#1}\@ne + \begingroup \let\@elt\@stpelt \csname cl@#1\endcsname \endgroup + \fi + }} + }{} \let\ZREF@org@@stpelt\@stpelt \def\@stpelt#1{% \ifcsname ZREF@perpage@#1\endcsname @@ -138,7 +150,6 @@ \let\csname ZREF@perpage@#1\endcsname\@undefined }% } -%% \section{Installation} \endinput %% %% End of file `zref-perpage.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-runs.sty b/Master/texmf-dist/tex/latex/zref/zref-runs.sty index ebfed278f23..b19b1282344 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-runs.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2020-07-03 v2.32 Module runs for zref (HO)]% + [2022-03-08 v2.33 Module runs for zref (HO)]% \providecommand*{\zruns}{0}% \AtBeginDocument{% \edef\zruns{\number\numexpr\zruns+1}% @@ -62,7 +61,6 @@ \fi \endgroup } -%% \section{Installation} \endinput %% %% End of file `zref-runs.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-savepos.sty b/Master/texmf-dist/tex/latex/zref/zref-savepos.sty index afdddaa2138..48c0fd04d6f 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-savepos.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2020-07-03 v2.32 Module savepos for zref (HO)]% + [2022-03-08 v2.33 Module savepos for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -136,7 +135,6 @@ \zref@extract{#1}{posy}% }% \let\ZREF@savepos@ok=Y -%% \section{Installation} \endinput %% %% End of file `zref-savepos.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-thepage.sty b/Master/texmf-dist/tex/latex/zref/zref-thepage.sty index 93f67608eac..07d89598373 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-thepage.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2020-07-03 v2.32 Module thepage for zref (HO)]% + [2022-03-08 v2.33 Module thepage for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -84,7 +83,6 @@ \zref@thepage{#1}% }% } -%% \section{Installation} \endinput %% %% End of file `zref-thepage.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-titleref.sty b/Master/texmf-dist/tex/latex/zref/zref-titleref.sty index f9313352561..a4f62346502 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-titleref.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2020-07-03 v2.32 Module titleref for zref (HO)]% + [2022-03-08 v2.33 Module titleref for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -288,7 +287,6 @@ \fi }{}% } -%% \section{Installation} \endinput %% %% End of file `zref-titleref.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-totpages.sty b/Master/texmf-dist/tex/latex/zref/zref-totpages.sty index 254efa3858a..f619e93da21 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-totpages.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2020-07-03 v2.32 Module totpages for zref (HO)]% + [2022-03-08 v2.33 Module totpages for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -62,7 +61,6 @@ \AtBeginDocument{% \zref@refused{LastPage}% } -%% \section{Installation} \endinput %% %% End of file `zref-totpages.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-user.sty b/Master/texmf-dist/tex/latex/zref/zref-user.sty index e31a79f8ab0..03f27ffbd31 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-user.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-user.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2020-07-03 v2.32 Module user for zref (HO)]% + [2022-03-08 v2.33 Module user for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -82,7 +81,6 @@ \ZREF@IfDefinable\zrefused\def{% {\zref@refused}% } -%% \section{Installation} \endinput %% %% End of file `zref-user.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref-xr.sty b/Master/texmf-dist/tex/latex/zref/zref-xr.sty index 45a1afdc94f..4f93fbc2ecf 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-xr.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2020-07-03 v2.32 Module xr for zref (HO)]% + [2022-03-08 v2.33 Module xr for zref (HO)]% \RequirePackage{zref-base}[2019/11/29] \ifx\ZREF@base@ok Y% \else @@ -447,7 +446,6 @@ }{% }% }% -%% \section{Installation} \endinput %% %% End of file `zref-xr.sty'. diff --git a/Master/texmf-dist/tex/latex/zref/zref.sty b/Master/texmf-dist/tex/latex/zref/zref.sty index 0a6b1f43a05..f2214387aa8 100644 --- a/Master/texmf-dist/tex/latex/zref/zref.sty +++ b/Master/texmf-dist/tex/latex/zref/zref.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: zref -%% Version: 2020-07-03 v2.32 +%% Version: 2022-03-08 v2.33 %% %% Copyright (C) %% 2006-2012 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -31,7 +31,6 @@ %% Heiko Oberdiek and the Oberdiek Package Support Group %% https://github.com/ho-tex/zref/issues %% -%% %% This work consists of the main source file zref.dtx %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, @@ -48,7 +47,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2020-07-03 v2.32 A new reference scheme for LaTeX (HO)]% + [2022-03-08 v2.33 A new reference scheme for LaTeX (HO)]% \RequirePackage{zref-base}[2019/11/29] \@ifundefined{ZREF@base@ok}{\endinput}{} \def\ZREF@temp#1{% @@ -76,7 +75,6 @@ \ZREF@temp{user} \ZREF@temp{xr} \ProcessOptions\relax -%% \section{Installation} \endinput %% %% End of file `zref.sty'. diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 51a0ab75cd5..bef4c5a4add 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -3144,6 +3144,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'xecjk' => 'xecjk-xelatex', 'xmuthesis' => 'etex', 'yathesis' => 'pdftex', + 'zref' => 'etex', ); $standardinsrunner = "latex -8bit"; |