doclicense (14feb15)

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

11 files changed, 69 insertions, 49 deletions

diff --git a/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf b/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
index 9f53323ca94..dd96a54c9cb 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/doc/latex/doclicense/images/doclicense-CC-by-nc-nd.eu.pdf b/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-by-nc-nd.eu.pdf
deleted file mode 100644
index 6570f0a56f0..00000000000
--- a/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-by-nc-nd.eu.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-by-nc-sa.eu.pdf b/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-by-nc-sa.eu.pdf
deleted file mode 100644
index 91222120458..00000000000
--- a/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-by-nc-sa.eu.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-by-nc.eu.pdf b/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-by-nc.eu.pdf
deleted file mode 100644
index f9f28528ffb..00000000000
--- a/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-by-nc.eu.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-cc-zero.pdf b/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-cc-zero.pdf
deleted file mode 100644
index 61e139f7fa9..00000000000
--- a/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-cc-zero.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-publicdomain.pdf b/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-publicdomain.pdf
deleted file mode 100644
index f246662ec20..00000000000
--- a/Master/texmf-dist/doc/latex/doclicense/images/doclicense-CC-publicdomain.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
index b73701f25ec..3907c30bcb0 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>
-    [2015/02/07 v0.9 Set and print the license of a document]
+    [2015/02/13 v0.10 Set and print the license of a document]
 %</package>
 %
 %<*driver>
@@ -48,6 +48,7 @@
   csquotes,
   xcolor,
   url,
+  hyperxmp,
   hypdoc,
   nameref,
   xspace,
@@ -60,7 +61,7 @@
   pdfsubject={\fileinfo},
   baseurl={\PackageURL},
   pdfkeywords={This document corresponds to \PackageName~\fileversion,
-    dated \filedate}
+    dated \filedate},
 }
 
 \title{The \PackageName{} package\thanks{This document
@@ -105,7 +106,8 @@ corresponds to \PackageName~\fileversion, dated \filedate.}}
 % \changes{0.7}{2015/02/05}{Initial version}
 % \changes{0.8}{2015/02/06}{Added support for CC-zero and CC-pd and small improvements}
 % \changes{0.9}{2015/02/07}{Added list of supported licenses to docu and added option imagemodifier.
-%   Also renamed macro \cmd{\doclicenseLicense} to \cmd{\doclicenseThis}} %
+%   Also renamed macro \cmd{\doclicenseLicense} to \cmd{\doclicenseThis}}
+% \changes{0.10}{2015/02/13}{Added support for hyperxmp}
 %
 % \DoNotIndex{\RequirePackage, \DeclareOption, \ProcessOptions}
 % \DoNotIndex{\PackageWarning, \MessageBreak}
@@ -156,6 +158,12 @@ corresponds to \PackageName~\fileversion, dated \filedate.}}
 % \end{quote}
 %
 % This will explicitly set the license to \doclicenseNameRef.
+%
+% If the \PrintPackage{hyperxmp} package is loaded, then the options
+% \PrintOptionF{pdflicenseurl} and \PrintOptionF{pdfcopyright} will be set
+% by \PrintPackage{doclicense} to the corresponding values
+% (\enquote{\url{\doclicenseURL}} and \enquote{\doclicenseLongText{}}).
+%
 % \bigskip
 %
 % The first parameter is \enquote{\PrintOptionF{type}}. \DescribePara{type}
@@ -273,14 +281,14 @@ corresponds to \PackageName~\fileversion, dated \filedate.}}
 %
 % \makeatletter
 % \begin{eqlist}
-%   \item[by@3.0] \csname doclicense@lang@lic@CC@by@3.0\endcsname
-%   \item[by-sa@3.0] \csname doclicense@lang@lic@CC@by-sa@3.0\endcsname
-%   \item[by-nd@3.0] \csname doclicense@lang@lic@CC@by-nd@3.0\endcsname
-%   \item[by-nc@3.0] \csname doclicense@lang@lic@CC@by-nc@3.0\endcsname
-%   \item[by-nc-sa@3.0] \csname doclicense@lang@lic@CC@by-nc-sa@3.0\endcsname
-%   \item[by-nc-nc@3.0] \csname doclicense@lang@lic@CC@by-nc-nd@3.0\endcsname
-%   \item[zero@1.0] \csname doclicense@lang@lic@CC@zero@1.0\endcsname
-%   \item[pd@1.0] \csname doclicense@lang@lic@CC@pd@1.0\endcsname
+%   \item[by@3.0] \@nameuse{doclicense@lang@lic@CC@by@3.0}
+%   \item[by-sa@3.0] \@nameuse{doclicense@lang@lic@CC@by-sa@3.0}
+%   \item[by-nd@3.0] \@nameuse{doclicense@lang@lic@CC@by-nd@3.0}
+%   \item[by-nc@3.0] \@nameuse{doclicense@lang@lic@CC@by-nc@3.0}
+%   \item[by-nc-sa@3.0] \@nameuse{doclicense@lang@lic@CC@by-nc-sa@3.0}
+%   \item[by-nc-nc@3.0] \@nameuse{doclicense@lang@lic@CC@by-nc-nd@3.0}
+%   \item[zero@1.0] \@nameuse{doclicense@lang@lic@CC@zero@1.0}
+%   \item[pd@1.0] \@nameuse{doclicense@lang@lic@CC@pd@1.0}
 % \end{eqlist}
 % \makeatother
 %
@@ -312,6 +320,12 @@ corresponds to \PackageName~\fileversion, dated \filedate.}}
   \@ifpackageloaded{graphicx}{}{\RequirePackage{graphicx}}
     %% For \doclicenseImage
   \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}
+  \@ifpackageloaded{hyperxmp}{%
+    \hypersetup{
+      pdfcopyright  = {\doclicenseLongText},
+      pdflicenseurl = {\doclicenseURL},
+    }
+  }{}
 }
 %% }}}
 
@@ -343,8 +357,8 @@ corresponds to \PackageName~\fileversion, dated \filedate.}}
 \newboolean{doclicense@licenseKnown}
 \newlength{\doclicense@hsize}
 \newcommand{\doclicense@longName}{%
-  \csname doclicense@lang@lic@\doclicense@type @\doclicense@modifier%
-  @\doclicense@versionUsed\endcsname
+  \@nameuse{doclicense@lang@lic@\doclicense@type @\doclicense@modifier%
+    @\doclicense@versionUsed}
 }
 \newcommand{\doclicense@icon}{%
   \PackageError{doclicense}{Icon not defined}
@@ -414,7 +428,7 @@ corresponds to \PackageName~\fileversion, dated \filedate.}}
   \input{doclicense-\doclicense@lang.ldf}
 }{%
   \PackageWarning{doclicense}{%
-    No language definition for \doclicense@lang not found.
+    No language definition for \doclicense@lang found.
     Please add one and submit a patch. Using English as fallback.}
   \renewcommand{\doclicense@lang}{english}
   \input{doclicense-\doclicense@lang.ldf}
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-UKenglish.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-UKenglish.ldf
index 3c6a45f4611..4f522e2c6c6 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-UKenglish.ldf
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-UKenglish.ldf
@@ -1,3 +1,3 @@
-\ProvidesFile{doclicense-USenglish.ldf}
+\ProvidesFile{doclicense-UKenglish.ldf}
 
 \input{doclicense-english.ldf}
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
index 91f5e21f95a..ce4e36ec7d1 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
@@ -1,21 +1,21 @@
 \ProvidesFile{doclicense-english.ldf}
 
-\edef\doclicense@lang@thisDoc{This work is licensed under a}%
-\edef\doclicense@lang@word@license{license}%
-\edef\doclicense@lang@code{en}%
+\@namedef{doclicense@lang@thisDoc}{This work is licensed under a}%
+\@namedef{doclicense@lang@word@license}{license}%
+\@namedef{doclicense@lang@code}{en}%
 
-\edef\doclicense@lang@lic@CC@code{}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by@3.0\endcsname{Attribution 3.0 Unported}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-sa@3.0\endcsname{Attribution-ShareAlike 3.0 Unported}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nd@3.0\endcsname{Attribution-NoDerivs 3.0 Unported}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nc@3.0\endcsname{Attribution-NonCommercial 3.0 Unported}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nc-sa@3.0\endcsname{Attribution-NonCommercial-ShareAlike 3.0 Unported}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nc-nd@3.0\endcsname{Attribution-NonCommercial-NoDerivs 3.0 Unported}%
-\expandafter\edef\csname doclicense@lang@lic@CC@zero@1.0\endcsname{CC0 1.0 Universal}%
-\expandafter\edef\csname doclicense@lang@lic@CC@pd@1.0\endcsname{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@code}{}%
+\@namedef{doclicense@lang@lic@CC@by@3.0}{Attribution 3.0 Unported}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution-ShareAlike 3.0 Unported}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Attribution-NoDerivs 3.0 Unported}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Attribution-NonCommercial 3.0 Unported}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Attribution-NonCommercial-ShareAlike 3.0 Unported}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Attribution-NonCommercial-NoDerivs 3.0 Unported}%
+\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
+\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
 
-\expandafter\edef\csname doclicense@lang@lic@CC@by-sa@4.0\endcsname{Attribution-ShareAlike 4.0 International}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nd@4.0\endcsname{Attribution-NoDerivatives 4.0 International}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nc@4.0\endcsname{Attribution-NonCommercial 4.0 International}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nc-sa@4.0\endcsname{Attribution-NonCommercial-ShareAlike 4.0 International}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nc-nd@4.0\endcsname{Attribution-NonCommercial-NoDerivatives 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Attribution-ShareAlike 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{Attribution-NoDerivatives 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{Attribution-NonCommercial 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{Attribution-NonCommercial-ShareAlike 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{Attribution-NonCommercial-NoDerivatives 4.0 International}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
index e0a62c0fd34..9698ad7f16f 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
@@ -1,18 +1,18 @@
 \ProvidesFile{doclicense-german.ldf}
 
-\edef\doclicense@lang@thisDoc{Dieses Werk ist lizenziert unter einer}%
-\edef\doclicense@lang@word@license{Lizenz}%
-\edef\doclicense@lang@code{de}%
+\@namedef{doclicense@lang@thisDoc}{Dieses Werk ist lizenziert unter einer}%
+\@namedef{doclicense@lang@word@license}{Lizenz}%
+\@namedef{doclicense@lang@code}{de}%
 \ifthenelse{\equal{\doclicense@imagemodifier}{}}{%
-  \edef\doclicense@imagemodifier{-eu}
+  \@namedef{doclicense@imagemodifier}{-eu}
 }{}
 
-\edef\doclicense@lang@lic@CC@code{deed.de}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by@3.0\endcsname{Namensnennung 3.0 Deutschland}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-sa@3.0\endcsname{Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 Deutschland}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nd@3.0\endcsname{Namensnennung-Keine Bearbeitung 3.0 Deutschland}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nc@3.0\endcsname{Namensnennung-Nicht kommerziell 3.0 Deutschland}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nc-sa@3.0\endcsname{Namensnennung - Nicht-kommerziell - Weitergabe unter gleichen Bedingungen 3.0 Deutschland}%
-\expandafter\edef\csname doclicense@lang@lic@CC@by-nc-nd@3.0\endcsname{Namensnennung - Nicht-kommerziell - Keine Bearbeitung 3.0 Deutschland}%
-\expandafter\edef\csname doclicense@lang@lic@CC@zero@1.0\endcsname{CC0 1.0 Universell}%
-% \expandafter\edef\csname doclicense@lang@lic@CC@pd@1.0\endcsname{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
+\@namedef{doclicense@lang@lic@CC@code}{deed.de}%
+\@namedef{doclicense@lang@lic@CC@by@3.0}{Namensnennung 3.0 Deutschland}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Namensnennung - Weitergabe unter gleichen Bedingungen 3.0 Deutschland}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Namensnennung-Keine Bearbeitung 3.0 Deutschland}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Namensnennung-Nicht kommerziell 3.0 Deutschland}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Namensnennung - Nicht-kommerziell - Weitergabe unter gleichen Bedingungen 3.0 Deutschland}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Namensnennung - Nicht-kommerziell - Keine Bearbeitung 3.0 Deutschland}%
+\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universell}%
+% \@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
index 70b4b74eeb9..e1efe595bd8 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}
-    [2015/02/07 v0.9 Set and print the license of a document]
+    [2015/02/13 v0.10 Set and print the license of a document]
 
 %% Dependencies {{{
 \RequirePackage{kvoptions}
@@ -15,6 +15,12 @@
   \@ifpackageloaded{graphicx}{}{\RequirePackage{graphicx}}
     %% For \doclicenseImage
   \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}
+  \@ifpackageloaded{hyperxmp}{%
+    \hypersetup{
+      pdfcopyright  = {\doclicenseLongText},
+      pdflicenseurl = {\doclicenseURL},
+    }
+  }{}
 }
 %% }}}
 
@@ -35,8 +41,8 @@
 \newboolean{doclicense@licenseKnown}
 \newlength{\doclicense@hsize}
 \newcommand{\doclicense@longName}{%
-  \csname doclicense@lang@lic@\doclicense@type @\doclicense@modifier%
-  @\doclicense@versionUsed\endcsname
+  \@nameuse{doclicense@lang@lic@\doclicense@type @\doclicense@modifier%
+    @\doclicense@versionUsed}
 }
 \newcommand{\doclicense@icon}{%
   \PackageError{doclicense}{Icon not defined}
@@ -97,7 +103,7 @@
   \input{doclicense-\doclicense@lang.ldf}
 }{%
   \PackageWarning{doclicense}{%
-    No language definition for \doclicense@lang not found.
+    No language definition for \doclicense@lang found.
     Please add one and submit a patch. Using English as fallback.}
   \renewcommand{\doclicense@lang}{english}
   \input{doclicense-\doclicense@lang.ldf}