From 66ebd4914b367eb00a52ce5d5bb51f695101931b Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 26 Sep 2020 03:03:17 +0000 Subject: CTAN sync 202009260303 --- macros/latex/contrib/doclicense/doclicense.dtx | 21 +++++++++++---------- macros/latex/contrib/doclicense/doclicense.pdf | Bin 272553 -> 254137 bytes 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'macros/latex/contrib/doclicense') diff --git a/macros/latex/contrib/doclicense/doclicense.dtx b/macros/latex/contrib/doclicense/doclicense.dtx index ef894621f8..75e34f64a8 100644 --- a/macros/latex/contrib/doclicense/doclicense.dtx +++ b/macros/latex/contrib/doclicense/doclicense.dtx @@ -27,7 +27,7 @@ %\NeedsTeXFormat{LaTeX2e}[1998/12/01] %\ProvidesPackage{doclicense} %<*package> - [2020/09/18 v2.2.1.dev Support for putting documents under a license] + [2020/09/25 v2.2.1 Support for putting documents under a license] % % %<*driver> @@ -51,10 +51,8 @@ babel, csquotes, xcolor, - hyperxmp, hypdoc, nameref, - xspace, eqlist, } \usepackage[iso]{isodate} @@ -139,6 +137,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed % \changes{2.0.1}{2020/06/26}{Fix backwards compatibility by still accepting imagemodifier={-eu} and imagemodifier={-us}. Thanks to Jürgen Spitzmüller for reporting. Fix ability to modify currency of \cmd{\doclicenseIcon} macro using imagemodifier to Japan currency JP without breaking \cmd{\doclicenseImage}.} % \changes{2.1.0}{2020/07/26}{Fix regression: Proper language default image variants (Euro variants for example) was broken and the US variant was always used. This bug was introduced in v2.0.0. Documentation fixes. Added Marathi translation.} % \changes{2.2.0}{2020/09/18}{Add Japanese and Bulgarian translation. Add hint how to use Chinese to docs. Load hyperxmp by default when it is installed. Before, doclicense just suggested to load it and made use of the package when the user did.} +% \changes{2.2.1}{2020/09/25}{Fix compatibility issue with newer versions of hyperxmp (bug confirmed with Tex Live 2020) resulting in an compile error by loading hyperxmp and hyperref in the order the packages expect it.} % % @@ -623,18 +622,20 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed \@ifpackageloaded{graphicx}{}{\RequirePackage{graphicx}} %% For \doclicenseImage \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}} - \IfFileExists{hyperxmp.sty}{ - \@ifpackageloaded{hyperxmp}{}{\RequirePackage{hyperxmp}} + \@ifpackageloaded{hyperxmp}{ %% The following options are only defined when the hyperxmp package was loaded. \hypersetup{ pdfcopyright = {\doclicenseLongText}, pdflicenseurl = {\doclicenseURL}, } - }{ - \PackageWarning{doclicense}{% - The hyperxmp package is missing so no license metadata can be embedded - into the PDF. Consider installing hyperxmp.% chktex 13 - } + }{} +} +\IfFileExists{hyperxmp.sty}{ + \@ifpackageloaded{hyperxmp}{}{\RequirePackage{hyperxmp}} +}{ + \PackageWarning{doclicense}{% + The hyperxmp package is missing so no license metadata can be embedded + into the PDF. Consider installing hyperxmp.% chktex 13 } } %% ))) diff --git a/macros/latex/contrib/doclicense/doclicense.pdf b/macros/latex/contrib/doclicense/doclicense.pdf index 1f3aed15a3..0ae88d6b61 100644 Binary files a/macros/latex/contrib/doclicense/doclicense.pdf and b/macros/latex/contrib/doclicense/doclicense.pdf differ -- cgit v1.2.3