doclicense (17may15)

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

4 files changed, 76 insertions, 38 deletions

diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
index 68db2d22f7f..b3be5bf946e 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
@@ -1,11 +1,10 @@
 \ProvidesFile{doclicense-english.ldf}
 
 \@namedef{doclicense@lang@thisDoc}{This work is licensed under a}%
-\@namedef{doclicense@lang@word@license}{license}%
-\@namedef{doclicense@lang@code}{en}%
+\@namedef{doclicense@lang@word@license}{ license}%
 
-\@namedef{doclicense@lang@lic@CC@code}{}%
-%% English is the default
+\@namedef{doclicense@lang@lic@CC@code}{en}%
+%% Using: https://en.wikipedia.org/wiki/ISO_639-1
 
 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
 \@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
index a0cf16a5b84..7bf7ce940c4 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
@@ -1,14 +1,13 @@
 \ProvidesFile{doclicense-german.ldf}
 
 \@namedef{doclicense@lang@thisDoc}{Dieses Werk ist lizenziert unter einer}%
-\@namedef{doclicense@lang@word@license}{Lizenz}%
-\@namedef{doclicense@lang@code}{de}%
+\@namedef{doclicense@lang@word@license}{ Lizenz}%
 \ifthenelse{\equal{\doclicense@imagemodifier}{}}{%
   \@namedef{doclicense@imagemodifier}{-eu}
 }{}
 
 \@namedef{doclicense@lang@lic@CC@code}{de}%
-\@namedef{doclicense@lang@translation@lic@CC@code}{deed.de}%
+%% Using: https://en.wikipedia.org/wiki/ISO_639-1
 
 \@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-spanish.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf
new file mode 100644
index 00000000000..059299fa1b1
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-spanish.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{Este documento esta realizado bajo licencia}%
+\@namedef{doclicense@lang@word@license}{}%
+
+\@namedef{doclicense@lang@lic@CC@code}{es}%
+%% Using: https://en.wikipedia.org/wiki/ISO_639-1
+
+\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
+\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+
+\@namedef{doclicense@lang@lic@CC@by@3.0}{Reconocimiento 3.0 España}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Reconocimiento-CompartirIgual 3.0 España}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Reconocimiento-SinObraDerivada 3.0 España}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Reconocimiento-NoCommercial 3.0 España}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Reconocimiento-NoCommercial-CompartirIgual 3.0 España}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Reconocimiento-NoCommercial-NoDerivs 3.0 España}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{Reconocimiento 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Reconocimiento-CompartirIgual 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{Reconocimiento-SinObraDerivada 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{Reconocimiento-NoCommercial 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{Reconocimiento-NoCommercial-CompartirIgual 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{Reconocimiento-NoCommercial-SinObraDerivada 4.0 Internacional}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
index cc8b871970b..05c9f05edc1 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
@@ -1,9 +1,9 @@
 %% See file 'doclicense.dtx' for copyright and license.
 \NeedsTeXFormat{LaTeX2e}[1998/12/01]
 \ProvidesPackage{doclicense}
-    [2015/04/06 v1.1 Support for putting documents under a license]
+    [2015/05/16 v1.2 Support for putting documents under a license]
 
-%% Dependencies {{{
+%% Dependencies (((
 \RequirePackage{kvoptions}
 \RequirePackage{xifthen}
 \RequirePackage{etoolbox} %% \ifcsdef
@@ -23,19 +23,19 @@
     }
   }{}
 }
-%% }}}
+%% )))
 
-%% Parameters {{{
+%% Parameters (((
 \DeclareStringOption[CC]{type}
 \DeclareStringOption[by-sa]{modifier}
 \DeclareStringOption{version}
 \DeclareStringOption{lang}
 \DeclareStringOption{imagemodifier}
 \DeclareStringOption[10em]{imagewidth}
-%% }}}
+%% )))
 
 \ProcessLocalKeyvalOptions*
-%% Declare variables {{{
+%% Declare variables (((
 \newcommand{\doclicense@baseUrlCC}{https://creativecommons.org}
 \newcommand{\doclicense@versionFallback}{}
 \newcommand{\doclicense@versionUsed}{}
@@ -49,15 +49,16 @@
   \PackageError{doclicense}{Icon not defined}
     {Please check the documentation of doclicense to see what you can do about it.}%
 }
-%% }}}
+\newcommand{\doclicense@modifier@uppercase}{\texorpdfstring{\MakeUppercase{\doclicense@modifier}}{\doclicense@modifier}}
+%% )))
 
-%% User macros {{{
+%% User macros (((
 \newcommand{\doclicenseType}{\doclicense@type\xspace}
 \newcommand{\doclicenseLongType}{}
-\newcommand{\doclicenseModifier}{\MakeUppercase{\doclicense@modifier}\xspace}
+\newcommand{\doclicenseModifier}{\doclicense@modifier@uppercase\xspace}
 \newcommand{\doclicenseVersion}{\doclicense@versionUsed\xspace}
 \newcommand{\doclicenseName}{%
-  \doclicense@type~\MakeUppercase{\doclicense@modifier}~\doclicense@versionUsed\xspace%
+  \doclicense@type~\doclicense@modifier@uppercase~\doclicense@versionUsed\xspace%
 }
 \newcommand{\doclicenseNameRef}{\href{\doclicenseURL}{\doclicenseName}\xspace}
 \newcommand{\doclicenseLongName}{\doclicenseLongType\space\doclicense@longName\xspace}
@@ -100,9 +101,9 @@
     \end{minipage}
   \end{center}
 }
-%% }}}
+%% )))
 
-%% Language support {{{
+%% Language support (((
 \ifthenelse{\equal{\doclicense@lang}{}}{%
   \renewcommand{\doclicense@lang}{\languagename}}{}
 \IfFileExists{doclicense-\doclicense@lang.ldf}{%
@@ -118,9 +119,9 @@
   \@namedef{doclicense@imagemodifier}{}
 }{}
 
-%% }}}
+%% )))
 
-%% Set license {{{
+%% Set license (((
 \newcommand{\doclicense@setVersion}[1][]{%
   \ifthenelse{\equal{#1}{}}{}{%
     \renewcommand{\doclicense@versionFallback}{#1}
@@ -132,7 +133,7 @@
   }
 }
 \newcommand{\doclicense@set}{%
-  %% CC {{{
+  %% CC (((
   \ifthenelse{\equal{\doclicense@type}{CC}}{%
     \renewcommand{\doclicenseLongType}{Creative Commons\xspace}
 
@@ -143,16 +144,7 @@
       \ifthenelse{\equal{\doclicense@lang@lic@CC@code}{}}{%
         \edef\doclicense@UrlLangPart{}
       }{%
-        \ifthenelse{%
-          %% German only: Version 3.0 and version 4.0 use a different different URL schema.
-          \equal{\doclicense@lang@lic@CC@code}{de}%
-          \AND%
-          \equal{\doclicense@versionUsed}{4.0}%
-        }{%
-          \edef\doclicense@UrlLangPart{/\doclicense@lang@translation@lic@CC@code}
-        }{%
-          \edef\doclicense@UrlLangPart{/\doclicense@lang@lic@CC@code}
-        }
+        \edef\doclicense@UrlLangPart{/deed.\doclicense@lang@lic@CC@code}
       }
     }
     \ifcsdef{doclicenseURL}{}{%
@@ -163,6 +155,10 @@
         \doclicense@versionUsed\doclicense@UrlLangPart%
       }
     }
+    \ifthenelse{\equal{\doclicense@modifier}{by}}{%
+      \renewcommand{\doclicense@icon}{\ccby}
+      \renewcommand{\doclicense@imagemodifier}{}
+    }{}
     \ifthenelse{\equal{\doclicense@modifier}{by-sa}}{%
       \renewcommand{\doclicense@icon}{\ccbysa}
       \renewcommand{\doclicense@imagemodifier}{}
@@ -173,12 +169,32 @@
     }{}
     \ifthenelse{\equal{\doclicense@modifier}{by-nc}}{%
       \renewcommand{\doclicense@icon}{\ccbync}
+      \ifthenelse{\equal{\doclicense@imagemodifier}{-eu}}{%
+        \renewcommand{\doclicense@icon}{\ccbynceu}
+      }{}
+      \ifthenelse{\equal{\doclicense@imagemodifier}{-jp}}{%
+        \renewcommand{\doclicense@icon}{\ccbyncjp}
+      }{}
       \renewcommand{\doclicense@imagemodifier}{}
     }{}
-    \ifthenelse{\equal{\doclicense@modifier}{by-nc-sa}}
-      {\renewcommand{\doclicense@icon}{\ccbync}}{}
-    \ifthenelse{\equal{\doclicense@modifier}{by-nc-nd}}
-      {\renewcommand{\doclicense@icon}{\ccbync}}{}
+    \ifthenelse{\equal{\doclicense@modifier}{by-nc-sa}}{
+      \renewcommand{\doclicense@icon}{\ccbyncsa}
+      \ifthenelse{\equal{\doclicense@imagemodifier}{-eu}}{%
+        \renewcommand{\doclicense@icon}{\ccbyncsaeu}
+      }{}
+      \ifthenelse{\equal{\doclicense@imagemodifier}{-jp}}{%
+        \renewcommand{\doclicense@icon}{\ccbyncsajp}
+      }{}
+    }{}
+    \ifthenelse{\equal{\doclicense@modifier}{by-nc-nd}}{
+      \renewcommand{\doclicense@icon}{\ccbyncnd}
+      \ifthenelse{\equal{\doclicense@imagemodifier}{-eu}}{%
+        \renewcommand{\doclicense@icon}{\ccbyncndeu}
+      }{}
+      \ifthenelse{\equal{\doclicense@imagemodifier}{-jp}}{%
+        \renewcommand{\doclicense@icon}{\ccbyncndjp}
+      }{}
+    }{}
     \ifthenelse{\equal{\doclicense@modifier}{zero}}{%
       \renewcommand{\doclicense@icon}{\cczero}
       \renewcommand{\doclicense@imagemodifier}{}
@@ -207,13 +223,13 @@
     }
 
     \setboolean{doclicense@licenseKnown}{true}
-  }{}%% }}}
+  }{}%% )))
   \ifthenelse{\not\boolean{doclicense@licenseKnown}}{%
     \PackageError{doclicense}{License unknown}%
       {Please check the documentation of doclicense to see what you can do about it.}%
   }{}%
 }
-%% }}}
+%% )))
 
 \doclicense@set%
 \endinput