diff options
author | Karl Berry <karl@freefriends.org> | 2015-02-14 22:21:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-02-14 22:21:47 +0000 |
commit | 40c6511c7aad371e280e02fc452115793aa47da0 (patch) | |
tree | 4d12d232ac40dae0aa5a779b778fb6ec1cb721d6 /Master/texmf-dist/tex | |
parent | dfa471aff8d22b4de7c73b95333c34fcf9e9b9d8 (diff) |
doclicense (14feb15)
git-svn-id: svn://tug.org/texlive/trunk@36276 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
4 files changed, 41 insertions, 35 deletions
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} |