texlive[56445] Master/texmf-dist: doclicense (26sep20)

[commits+karl at tug.org]

Revision: 56445
          http://tug.org/svn/texlive?view=revision&revision=56445
Author:   karl
Date:     2020-09-26 23:49:09 +0200 (Sat, 26 Sep 2020)
Log Message:
-----------
doclicense (26sep20)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
    trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
    trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty

Modified: trunk/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx	2020-09-26 21:48:44 UTC (rev 56444)
+++ trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx	2020-09-26 21:49:09 UTC (rev 56445)
@@ -27,7 +27,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1998/12/01]
 %<package>\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]
 %</package>
 %
 %<*driver>
@@ -51,10 +51,8 @@
   babel,
   csquotes,
   xcolor,
-  hyperxmp,
   hypdoc,
   nameref,
-  xspace,
   eqlist,
 }
 \usepackage[iso]{isodate}
@@ -139,6 +137,7 @@
 % \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 @@
   \@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
   }
 }
 %% )))

Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty	2020-09-26 21:48:44 UTC (rev 56444)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty	2020-09-26 21:49:09 UTC (rev 56445)
@@ -1,7 +1,7 @@
 %% See file 'doclicense.dtx' for copyright and license.
 \NeedsTeXFormat{LaTeX2e}[1998/12/01]
 \ProvidesPackage{doclicense}
-    [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]
 
 %% ^^A nag warned about the center environment and it really messes up spacing.
 
@@ -74,18 +74,20 @@
   \@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
   }
 }
 %% )))