diff options
author | Karl Berry <karl@freefriends.org> | 2024-03-18 20:04:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-03-18 20:04:13 +0000 |
commit | 392b90ca61e104045d9216de5d13413d6992660d (patch) | |
tree | a4b8f527674707296924643417b2d1b0980ab5a6 /Master/texmf-dist | |
parent | 74c4f26ba81ba58b3ce728796bcb6a94d03800af (diff) |
hyperxmp (18mar24)
git-svn-id: svn://tug.org/texlive/trunk@70694 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/hyperxmp/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hyperxmp/einstein-xmp.tex (renamed from Master/texmf-dist/source/latex/hyperxmp/einstein-xmp.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hyperxmp/einstein1.pdf (renamed from Master/texmf-dist/source/latex/hyperxmp/einstein1.pdf) | bin | 70830 -> 70830 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/hyperxmp/einstein2.pdf (renamed from Master/texmf-dist/source/latex/hyperxmp/einstein2.pdf) | bin | 77679 -> 77679 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/hyperxmp/gglo-hyxmp.ist (renamed from Master/texmf-dist/source/latex/hyperxmp/gglo-hyxmp.ist) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hyperxmp/gind-hyxmp.ist (renamed from Master/texmf-dist/source/latex/hyperxmp/gind-hyxmp.ist) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hyperxmp/hyperxmp-stds.tex (renamed from Master/texmf-dist/source/latex/hyperxmp/hyperxmp-stds.tex) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf | bin | 1289541 -> 1259976 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/hyperxmp-add-bytecount.man1.pdf | bin | 20521 -> 20610 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx | 77 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty | 35 |
11 files changed, 67 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperxmp/README b/Master/texmf-dist/doc/latex/hyperxmp/README index 22a0b26a9a7..e7a901f976b 100644 --- a/Master/texmf-dist/doc/latex/hyperxmp/README +++ b/Master/texmf-dist/doc/latex/hyperxmp/README @@ -47,7 +47,7 @@ Building hyperxmp.pdf is a little more involved: Copyright and license ===================== -Copyright (C) 2011-2023 Scott Pakin +Copyright (C) 2011-2024 Scott Pakin This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/source/latex/hyperxmp/einstein-xmp.tex b/Master/texmf-dist/doc/latex/hyperxmp/einstein-xmp.tex index 323937cc4a6..323937cc4a6 100644 --- a/Master/texmf-dist/source/latex/hyperxmp/einstein-xmp.tex +++ b/Master/texmf-dist/doc/latex/hyperxmp/einstein-xmp.tex diff --git a/Master/texmf-dist/source/latex/hyperxmp/einstein1.pdf b/Master/texmf-dist/doc/latex/hyperxmp/einstein1.pdf Binary files differindex 3a283dfca70..3a283dfca70 100644 --- a/Master/texmf-dist/source/latex/hyperxmp/einstein1.pdf +++ b/Master/texmf-dist/doc/latex/hyperxmp/einstein1.pdf diff --git a/Master/texmf-dist/source/latex/hyperxmp/einstein2.pdf b/Master/texmf-dist/doc/latex/hyperxmp/einstein2.pdf Binary files differindex 3a3144d096a..3a3144d096a 100644 --- a/Master/texmf-dist/source/latex/hyperxmp/einstein2.pdf +++ b/Master/texmf-dist/doc/latex/hyperxmp/einstein2.pdf diff --git a/Master/texmf-dist/source/latex/hyperxmp/gglo-hyxmp.ist b/Master/texmf-dist/doc/latex/hyperxmp/gglo-hyxmp.ist index 10bb414bc3f..10bb414bc3f 100644 --- a/Master/texmf-dist/source/latex/hyperxmp/gglo-hyxmp.ist +++ b/Master/texmf-dist/doc/latex/hyperxmp/gglo-hyxmp.ist diff --git a/Master/texmf-dist/source/latex/hyperxmp/gind-hyxmp.ist b/Master/texmf-dist/doc/latex/hyperxmp/gind-hyxmp.ist index dc926c07b3b..dc926c07b3b 100644 --- a/Master/texmf-dist/source/latex/hyperxmp/gind-hyxmp.ist +++ b/Master/texmf-dist/doc/latex/hyperxmp/gind-hyxmp.ist diff --git a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp-stds.tex b/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp-stds.tex index 2b77c2703d6..2b77c2703d6 100644 --- a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp-stds.tex +++ b/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp-stds.tex diff --git a/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf b/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf Binary files differindex 2664608ae65..e484b17e602 100644 --- a/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf +++ b/Master/texmf-dist/doc/latex/hyperxmp/hyperxmp.pdf diff --git a/Master/texmf-dist/doc/man/man1/hyperxmp-add-bytecount.man1.pdf b/Master/texmf-dist/doc/man/man1/hyperxmp-add-bytecount.man1.pdf Binary files differindex dc56ef71526..6189e689b47 100644 --- a/Master/texmf-dist/doc/man/man1/hyperxmp-add-bytecount.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/hyperxmp-add-bytecount.man1.pdf diff --git a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx b/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx index 9be837cf2aa..10045102c16 100644 --- a/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx +++ b/Master/texmf-dist/source/latex/hyperxmp/hyperxmp.dtx @@ -22,7 +22,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{hyperxmp} %<*package> - [2023/09/10 v5.12 Store hyperref metadata in XMP format] + [2024/03/17 v5.13 Store hyperref metadata in XMP format] %</package> % %<*driver> @@ -131,7 +131,7 @@ %</driver> % \fi % -% \CheckSum{2848} +% \CheckSum{2859} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -206,10 +206,6 @@ % \protect\cs{AtEndPreamble}, as is done by % \protect\pkgname{doclicense}~v2.2.0. Thanks to Tommaso Pecorella % for the bug report and help testing} -% \changes{v5.6}{2020/10/05}{Make conditional the loading of the -% \protect\pkgname{ifdraft} package. Thanks to Tobias Pape for -% reporting the incompatibility between \protect\pkgname{hyperxmp} and -% \protect\pkgname{ifdraft}} % % ^^A \GetFileInfo{hyperxmp.dtx} % @@ -2274,33 +2270,52 @@ sub mycmd { % \end{macro} % % \begin{macro}{\ifdraft} +% \changes{v5.2}{2020/04/18}{Define \protect\cs{ifdraft} only locally, at +% Niklas Beisert's request} +% \changes{v5.6}{2020/10/05}{Make conditional the loading of the +% \protect\pkgname{ifdraft} package. Thanks to Tobias Pape for +% reporting the incompatibility between \protect\pkgname{hyperxmp} and +% \protect\pkgname{ifdraft}} +% \changes{v5.13}{2024/03/17}{Rewrite \protect\pkgname{ifdraft} handling +% to avoid loading a package within a group, which \protect\LaTeX\ +% soon will stop supporting. Thanks to Ulrike Fischer and Boris Veytsman +% for bringing this to my attention} % \begin{macro}{\next} % Use the \pkgname{ifdraft} package to determine if this is a draft or % final document. The challenge here is that we want to use % \pkgname{ifdraft} if it's already loaded, load it if not, and not % break any incompatible, author-defined \cs{ifdraft} macros that may % occur either before or after the |\usepackage{hyperxmp}|. Our -% solution begins by defining a new group. Then, if \pkgname{ifdraft} -% is not yet loaded, we locally undefine \cs{ifdraft} and load the -% package. In this case, we later ``unload'' the package by setting -% \cs{ver@ifdraft.sty} to \cs{relax}. -% \changes{v5.2}{2020/04/18}{Define \protect\cs{ifdraft} only locally, at -% Niklas Beisert's request} +% solution works as follows: +% +% \begin{itemize} +% \item If \pkgname{ifdraft} is already loaded, \cs{next} is defined +% as a no-op. +% \item If \pkgname{ifdraft} is not (yet) loaded, the code backs up +% then undefines \cs{ifdraft}, which may be author-defined. It then +% loads \pkgname{ifdraft} and defines \cs{next} to ``unload'' the +% package by setting the package's author-visible commands to +% \cs{relax}. +% \item Below, after \cs{ifdraft} is used to define +% \cs{@pdfrendition}, \cs{next} is invoked to unload a +% \pkgname{hyperxmp}-loaded \pkgname{ifdraft}. Finally, \cs{ifdraft} +% is restored to its original definition. +% \end{itemize} % \begin{macrocode} -\begingroup - \@ifpackageloaded{ifdraft}{% - \let\next=\relax - }{% +\let\hyxmp@orig@ifdraft=\ifdraft +\@ifpackageloaded{ifdraft}{% + \let\next=\relax +}{% + \let\ifdraft=\relax + \RequirePackage{ifdraft}% + \def\next{% + \expandafter\let\csname ver@ifdraft.sty\endcsname=\relax \let\ifdraft=\relax - \RequirePackage{ifdraft}% - \def\next{% - \expandafter\global\expandafter\let\csname ver@ifdraft.sty\endcsname=\relax - }% + \let\ifoptiondraft=\relax + \let\ifoptionfinal=\relax }% +}% % \end{macrocode} -% \end{macro} -% \end{macro} -% % \begin{macro}{\@pdfrendition} % \changes{v5.0}{2020/02/27}{Added the \protect\optname{pdfrendition} % option} @@ -2310,16 +2325,18 @@ sub mycmd { % |\documentclass[draft]|, for which |\@pdfrendition| defaults to % |draft|. % \begin{macrocode} - \ifdraft{% - \gdef\@pdfrendition{draft}% - }{% - \gdef\@pdfrendition{default}% - } - \next -\endgroup +\ifdraft{% + \def\@pdfrendition{draft}% +}{% + \def\@pdfrendition{default}% +} +\next +\let\ifdraft=\hyxmp@orig@ifdraft \define@key{Hyp}{pdfrendition}{\hyxmp@pdfstringdef\@pdfrendition{#1}} % \end{macrocode} % \end{macro} +% \end{macro} +% \end{macro} % % \begin{macro}{\@pdfpublication} % Prepare to store the name of the publication in which the diff --git a/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty b/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty index bd32588a1c0..8aed9b04c71 100644 --- a/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty +++ b/Master/texmf-dist/tex/latex/hyperxmp/hyperxmp.sty @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{hyperxmp} - [2023/09/10 v5.12 Store hyperref metadata in XMP format] + [2024/03/17 v5.13 Store hyperref metadata in XMP format] \IfDocumentMetadataTF{% \PackageWarning {hyperxmp} @@ -166,23 +166,26 @@ \define@key{Hyp}{pdfinstanceid}{\hyxmp@pdfstringdef\hyxmp@InstanceID{#1}} \def\@pdfversionid{1} \define@key{Hyp}{pdfversionid}{\hyxmp@pdfstringdef\@pdfversionid{#1}} -\begingroup - \@ifpackageloaded{ifdraft}{% - \let\next=\relax - }{% +\let\hyxmp@orig@ifdraft=\ifdraft +\@ifpackageloaded{ifdraft}{% + \let\next=\relax +}{% + \let\ifdraft=\relax + \RequirePackage{ifdraft}% + \def\next{% + \expandafter\let\csname ver@ifdraft.sty\endcsname=\relax \let\ifdraft=\relax - \RequirePackage{ifdraft}% - \def\next{% - \expandafter\global\expandafter\let\csname ver@ifdraft.sty\endcsname=\relax - }% + \let\ifoptiondraft=\relax + \let\ifoptionfinal=\relax }% - \ifdraft{% - \gdef\@pdfrendition{draft}% - }{% - \gdef\@pdfrendition{default}% - } - \next -\endgroup +}% +\ifdraft{% + \def\@pdfrendition{draft}% +}{% + \def\@pdfrendition{default}% +} +\next +\let\ifdraft=\hyxmp@orig@ifdraft \define@key{Hyp}{pdfrendition}{\hyxmp@pdfstringdef\@pdfrendition{#1}} \def\@pdfpublication{} \define@key{Hyp}{pdfpublication}{\hyxmp@pdfstringdef\@pdfpublication{#1}} |