doclicense (27jun20)

git-svn-id: svn://tug.org/texlive/trunk@55677 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 37 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf b/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
index 062290a2157..8b7fa40ae0f 100644
--- a/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
+++ b/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
diff --git a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
index 2713f14acf0..a223cb981ab 100644
--- a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
+++ b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
@@ -27,7 +27,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1998/12/01]
 %<package>\ProvidesPackage{doclicense}
 %<*package>
-    [2020/05/27 v2.0.0 Support for putting documents under a license]
+    [2020/06/26 v2.0.1 Support for putting documents under a license]
 %</package>
 %
 %<*driver>
@@ -57,6 +57,7 @@
   xspace,
   eqlist,
 }
+\usepackage[iso]{isodate}
 %% ^^A https://tex.stackexchange.com/a/95893/32320
 \setlength\IndexMin{100pt}
 \usepackage[
@@ -77,7 +78,8 @@
 }
 
 \title{The \PackageName{} package\thanks{This document
-corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
+corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filedate}.}}
+
 \author{\PackageAuthor\\
   \texttt{\href{mailto:\PackageAuthorEmail?subject=LaTeX package doclicense%
     \&body=Dear Robin Schneider,}%
@@ -134,6 +136,8 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
 % \changes{1.10.0}{2019/06/05}{Added Brazilian translation. Update Chinese and Portuguese translation. Do not use enumitem for list label customization (beamer compatibility).}
 % \changes{1.10.1}{2020/04/12}{Fix image for CC-BY-NC EU. Fix URL for CC-PDDC. Improve wording for catalan language.}
 % \changes{2.0.0}{2020/05/27}{Add 80x15 version of CC images which can be used with the imagemodifier option. Fix slight color offset for all CC images caused by bad image conversion. Thanks to rodrigoalcarazdelaosa for reporting. Fix \cmd{\doclicenseThis} support for twocolumn layouts. Thanks to Nao Pross. Soft require package options "type", "modifier" and "version" now. Defaults are deprecated. This will become a package error in an upcoming major version of the package, with the earliest release in 2021-07 to give people time to migrate. Remove Creative Commons PD which has been replaced by CC-zero as of 2010-10-11. Update example license used for examples in manual to CC-BY-SA-4.0.}
+% \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 money unit of \cmd{\doclicenseIcon} macro using imagemodifier to Japan currency JP without breaking \cmd{\doclicenseImage}.}
+%
 %
 
 %
@@ -253,19 +257,31 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
 % Based on the loaded language, the money unit is set to a suitable default. You can change this with:
 % \begin{quote}
 %   |\usepackage[| \\
-%   |  imagemodifier={-eu},| \\
+%   |  type={CC},| \\
+%   |  modifier={by-nc},| \\
+%   |  version={4.0},| \\
+%   |  imagemodifier={-eu-88x31},| \\
 %   |]{doclicense}|
 % \end{quote}
 %
 % Also, there is 80x15 which uses letters instead of icons for the modifiers in the image.
 % \begin{quote}
 %   |\usepackage[| \\
-%   |  imagemodifier={-80x15},| \\
+%   |  type={CC},| \\
+%   |  modifier={by-nc},| \\
+%   |  version={4.0},| \\
+%   |  imagemodifier={-eu-80x15},| \\
 %   |]{doclicense}|
 % \end{quote}
 %
 % If this is not given, we default to 88x31.
 %
+% Note that imagemodifier needs to assemble into a valid filename. Check
+% what files the package ships with to understand what combinations can be
+% used.
+%
+% For backwards compatibility, \enquote{-eu} is interpreted as \enquote{-eu-88x31}.
+%
 % This option allows you to specify
 % \DescribePara{hyphenation}
 % a macro name which is going to be expanded
@@ -415,10 +431,10 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
 %
 % \doclicenseThis
 %
-% And here is how it looks with the imagemodifier option set to \enquote{-80x15}:
-%
 % \makeatletter
 % \renewcommand{\doclicense@imagemodifier}{-80x15}
+% And here is how it looks with the imagemodifier option set to \enquote{\doclicense@imagemodifier}:
+%
 % \doclicenseThis
 % \renewcommand{\doclicense@imagemodifier}{-88x31}
 % \makeatother
@@ -778,7 +794,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
   \input{doclicense-\doclicense@lang.ldf}% chktex 27
 }
 \ifthenelse{\equal{\doclicense@imagemodifier}{-us}}{%
-  \@namedef{doclicense@imagemodifier}{}
+  \@namedef{doclicense@imagemodifier}{-88x31}% chktex 29
 }{}
 
 %% )))
@@ -837,6 +853,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
       }{}
       \IfBeginWith{\doclicense@imagemodifier}{-jp}{%
         \renewcommand{\doclicense@icon}{\ccbyncjp}
+        \renewcommand{\doclicense@imagemodifier}{-88x31}% chktex 29
       }{}
     }{}
     \ifthenelse{\equal{\doclicense@modifier}{by-nc-sa}}{
@@ -846,12 +863,14 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
       }{}
       \IfBeginWith{\doclicense@imagemodifier}{-jp}{%
         \renewcommand{\doclicense@icon}{\ccbyncsajp}
+        \renewcommand{\doclicense@imagemodifier}{-88x31}% chktex 29
       }{}
     }{}
     \ifthenelse{\equal{\doclicense@modifier}{by-nc-nd}}{
       \renewcommand{\doclicense@icon}{\ccbyncnd}
       \IfBeginWith{\doclicense@imagemodifier}{-jp}{%
         \renewcommand{\doclicense@icon}{\ccbyncndjp}
+        \renewcommand{\doclicense@imagemodifier}{-88x31}% chktex 29
       }{}
     }{}
     \ifthenelse{\equal{\doclicense@modifier}{zero}}{%
@@ -875,6 +894,9 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
         \renewcommand{\doclicense@imagemodifier}{}
       }{}
     }
+    \ifthenelse{\equal{\doclicense@imagemodifier}{-eu}}{%
+      \renewcommand{\doclicense@imagemodifier}{-eu-88x31}% chktex 29
+    }{}
 
     \ifcsdef{doclicense@lang@lic@\doclicense@type%
       @\doclicense@modifier @\doclicense@versionUsed}{}{%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
index fc6103d6780..87ec2aa8365 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
@@ -1,7 +1,7 @@
 %% See file 'doclicense.dtx' for copyright and license.
 \NeedsTeXFormat{LaTeX2e}[1998/12/01]
 \ProvidesPackage{doclicense}
-    [2020/05/27 v2.0.0 Support for putting documents under a license]
+    [2020/06/26 v2.0.1 Support for putting documents under a license]
 
 %% ^^A nag warned about the center environment and it really messes up spacing.
 
@@ -242,7 +242,7 @@
   \input{doclicense-\doclicense@lang.ldf}% chktex 27
 }
 \ifthenelse{\equal{\doclicense@imagemodifier}{-us}}{%
-  \@namedef{doclicense@imagemodifier}{}
+  \@namedef{doclicense@imagemodifier}{-88x31}% chktex 29
 }{}
 
 %% )))
@@ -298,6 +298,7 @@
       }{}
       \IfBeginWith{\doclicense@imagemodifier}{-jp}{%
         \renewcommand{\doclicense@icon}{\ccbyncjp}
+        \renewcommand{\doclicense@imagemodifier}{-88x31}% chktex 29
       }{}
     }{}
     \ifthenelse{\equal{\doclicense@modifier}{by-nc-sa}}{
@@ -307,12 +308,14 @@
       }{}
       \IfBeginWith{\doclicense@imagemodifier}{-jp}{%
         \renewcommand{\doclicense@icon}{\ccbyncsajp}
+        \renewcommand{\doclicense@imagemodifier}{-88x31}% chktex 29
       }{}
     }{}
     \ifthenelse{\equal{\doclicense@modifier}{by-nc-nd}}{
       \renewcommand{\doclicense@icon}{\ccbyncnd}
       \IfBeginWith{\doclicense@imagemodifier}{-jp}{%
         \renewcommand{\doclicense@icon}{\ccbyncndjp}
+        \renewcommand{\doclicense@imagemodifier}{-88x31}% chktex 29
       }{}
     }{}
     \ifthenelse{\equal{\doclicense@modifier}{zero}}{%
@@ -336,6 +339,9 @@
         \renewcommand{\doclicense@imagemodifier}{}
       }{}
     }
+    \ifthenelse{\equal{\doclicense@imagemodifier}{-eu}}{%
+      \renewcommand{\doclicense@imagemodifier}{-eu-88x31}% chktex 29
+    }{}
 
     \ifcsdef{doclicense@lang@lic@\doclicense@type%
       @\doclicense@modifier @\doclicense@versionUsed}{}{%