summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-04-12 21:31:05 +0000
committerKarl Berry <karl@freefriends.org>2020-04-12 21:31:05 +0000
commit62039812affa3280de097ce5b4a74e49172964b2 (patch)
tree60633c02f98fdf41a9b8410bbb94876f897dfc33 /Master/texmf-dist/source/latex
parentf79df4a5b3a9094b4d64efa0e295b54d1f854869 (diff)
doclicense (12apr20)
git-svn-id: svn://tug.org/texlive/trunk@54700 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/doclicense/doclicense.dtx21
1 files changed, 14 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
index df2b141bf11..3d262e9942f 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>
- [2019/06/05 v1.10.0 Support for putting documents under a license]
+ [2020/04/12 v1.10.1 Support for putting documents under a license]
%</package>
%
%<*driver>
@@ -128,6 +128,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
% \changes{1.8.0}{2018/06/10}{Added Polish translation.}
% \changes{1.9.0}{2019/04/07}{Added Catalan, Galician, Chinese and Portuguese translation. Detect and give hint when enquote macro is already defined. Fix LaTeX Error: Too deeply nested.}
% \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.}
%
%% ^^A nag warned about the center environment and it really messes up spacing.
%
@@ -415,12 +416,19 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
%
% \section{Supported licenses}
% \label{sec:supported-licenses}
-% \subsection{CC (Creative commons)}
+%
+% Currently only Creative Commons is supported.
+% The license type, modifier and version should be based on
+% \href{https://spdx.org/licenses/}{SPDX license identifiers}. Direct support
+% for SPDX license identifiers should be considered when supporting new
+% licenses.
+%
+% \subsection{CC (Creative Commons)}
%
% \makeatletter
% \begin{eqlist}
% \item[zero@1.0] \@nameuse{doclicense@lang@lic@CC@zero@1.0}
-% \item[pd@1.0] \@nameuse{doclicense@lang@lic@CC@pd@1.0}
+% \item[pd@1.0] \@nameuse{doclicense@lang@lic@CC@pd@null}
% \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}
@@ -761,7 +769,6 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
\ifthenelse{\equal{\doclicense@imagemodifier}{-jp}}{%
\renewcommand{\doclicense@icon}{\ccbyncjp}
}{}
- \renewcommand{\doclicense@imagemodifier}{}
}{}
\ifthenelse{\equal{\doclicense@modifier}{by-nc-sa}}{
\renewcommand{\doclicense@icon}{\ccbyncsa}
@@ -794,11 +801,11 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
\ifthenelse{\equal{\doclicense@modifier}{pd}}{
\renewcommand{\doclicense@icon}{\ccpd}
\renewcommand{\doclicense@imagemodifier}{}
- \doclicense@setVersion[1.0]
+ \doclicense@setVersion[null]
\edef\doclicenseURL{%
\doclicense@baseUrlCC/%
- licenses/publicdomain/%
- \doclicense@versionUsed\doclicense@UrlLangPart}
+ licenses/publicdomain%
+ \doclicense@UrlLangPart}
}{}
\ifcsdef{doclicense@lang@lic@\doclicense@type%