summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/doclicense
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-06 21:35:31 +0000
committerKarl Berry <karl@freefriends.org>2015-04-06 21:35:31 +0000
commitf38967c3a07b9e0a73b6c24d8491fc2b0b0b711c (patch)
tree66f26318dc83b7bc4652536ccbbcfee3fc8c943b /Master/texmf-dist/tex/latex/doclicense
parentde5db4b35978c704f983906ec90828012689b893 (diff)
doclicense (6apr15)
git-svn-id: svn://tug.org/texlive/trunk@36729 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/doclicense')
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf8
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf22
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense.sty50
3 files changed, 58 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
index ce4e36ec7d1..68db2d22f7f 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
@@ -5,15 +5,19 @@
\@namedef{doclicense@lang@code}{en}%
\@namedef{doclicense@lang@lic@CC@code}{}%
+%% English is the default
+
+\@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}{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}%
+\@namedef{doclicense@lang@lic@CC@by@4.0}{Attribution 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}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
index 9698ad7f16f..a0cf16a5b84 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
@@ -7,12 +7,22 @@
\@namedef{doclicense@imagemodifier}{-eu}
}{}
-\@namedef{doclicense@lang@lic@CC@code}{deed.de}%
+\@namedef{doclicense@lang@lic@CC@code}{de}%
+\@namedef{doclicense@lang@translation@lic@CC@code}{deed.de}%
+
+\@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.
+
\@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-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.
+\@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@by@4.0}{Namensnennung 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Namensnennung -- Weitergabe unter gleichen Bedingungen 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{Namensnennung -- Keine Bearbeitungen 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{Namensnennung-Nicht kommerziell 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{Namensnennung -- Nicht-kommerziell -- Weitergabe unter gleichen Bedingungen 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{Namensnennung -- Nicht kommerziell -- Keine Bearbeitungen 4.0 International}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
index 69f8a1b0577..cc8b871970b 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/03/30 v1.0 Support for putting documents under a license]
+ [2015/04/06 v1.1 Support for putting documents under a license]
%% Dependencies {{{
\RequirePackage{kvoptions}
@@ -16,6 +16,7 @@
%% For \doclicenseImage
\@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}
\@ifpackageloaded{hyperxmp}{%
+ %% The following options are only defined when the hyperxmp package was loaded.
\hypersetup{
pdfcopyright = {\doclicenseLongText},
pdflicenseurl = {\doclicenseURL},
@@ -56,7 +57,7 @@
\newcommand{\doclicenseModifier}{\MakeUppercase{\doclicense@modifier}\xspace}
\newcommand{\doclicenseVersion}{\doclicense@versionUsed\xspace}
\newcommand{\doclicenseName}{%
- \doclicense@type~\doclicense@modifier~\doclicense@versionUsed\xspace%
+ \doclicense@type~\MakeUppercase{\doclicense@modifier}~\doclicense@versionUsed\xspace%
}
\newcommand{\doclicenseNameRef}{\href{\doclicenseURL}{\doclicenseName}\xspace}
\newcommand{\doclicenseLongName}{\doclicenseLongType\space\doclicense@longName\xspace}
@@ -71,11 +72,13 @@
\doclicense@lang@word@license.\xspace%
}
\newcommand{\doclicenseIcon}{\doclicense@icon\xspace}
+\newcommand{\doclicenseImageFileName}{doclicense-\doclicense@type-\doclicense@modifier\doclicense@imagemodifier}
\newcommand{\doclicenseImage}[1][]{%
\setkeys{doclicense}{#1}
\href{\doclicenseURL}{%
- \includegraphics[width=\doclicense@imagewidth]%
- {doclicense-\doclicense@type-\doclicense@modifier\doclicense@imagemodifier}%
+ \includegraphics[
+ width=\doclicense@imagewidth%
+ ]{\doclicenseImageFileName}%
}
}
@@ -111,6 +114,9 @@
\renewcommand{\doclicense@lang}{english}
\input{doclicense-\doclicense@lang.ldf}
}
+\ifthenelse{\equal{\doclicense@imagemodifier}{-us}}{%
+ \@namedef{doclicense@imagemodifier}{}
+}{}
%% }}}
@@ -130,17 +136,33 @@
\ifthenelse{\equal{\doclicense@type}{CC}}{%
\renewcommand{\doclicenseLongType}{Creative Commons\xspace}
- \ifthenelse{\equal{\doclicense@lang@lic@CC@code}{}}{%
- \edef\doclicense@UrlLangPart{}
- }{%
- \edef\doclicense@UrlLangPart{/\doclicense@lang@lic@CC@code}
- }
\doclicense@setVersion[3.0]
- \edef\doclicenseURL{%
- \doclicense@baseUrlCC/%
- licenses/%
- \doclicense@modifier/%
- \doclicense@versionUsed\doclicense@UrlLangPart}
+
+ %% Allow to predefine the following macros in ldf files.
+ \ifcsdef{doclicense@UrlLangPart}{}{%
+ \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}
+ }
+ }
+ }
+ \ifcsdef{doclicenseURL}{}{%
+ \edef\doclicenseURL{%
+ \doclicense@baseUrlCC/%
+ licenses/%
+ \doclicense@modifier/%
+ \doclicense@versionUsed\doclicense@UrlLangPart%
+ }
+ }
\ifthenelse{\equal{\doclicense@modifier}{by-sa}}{%
\renewcommand{\doclicense@icon}{\ccbysa}
\renewcommand{\doclicense@imagemodifier}{}