texlive[54700] Master/texmf-dist: doclicense (12apr20)
commits+karl at tug.org
commits+karl at tug.org
Sun Apr 12 23:31:06 CEST 2020
Revision: 54700
http://tug.org/svn/texlive?view=revision&revision=54700
Author: karl
Date: 2020-04-12 23:31:05 +0200 (Sun, 12 Apr 2020)
Log Message:
-----------
doclicense (12apr20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-catalan.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-galician.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-polish.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
Modified: trunk/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx 2020-04-12 21:31:05 UTC (rev 54700)
@@ -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 @@
% \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 @@
%
% \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 at 1.0] \@nameuse{doclicense at lang@lic at CC@zero at 1.0}
-% \item[pd at 1.0] \@nameuse{doclicense at lang@lic at CC@pd at 1.0}
+% \item[pd at 1.0] \@nameuse{doclicense at lang@lic at CC@pd at null}
% \item[by at 3.0] \@nameuse{doclicense at lang@lic at CC@by at 3.0}
% \item[by-sa at 3.0] \@nameuse{doclicense at lang@lic at CC@by-sa at 3.0}
% \item[by-nd at 3.0] \@nameuse{doclicense at lang@lic at CC@by-nd at 3.0}
@@ -761,7 +769,6 @@
\ifthenelse{\equal{\doclicense at imagemodifier}{-jp}}{%
\renewcommand{\doclicense at icon}{\ccbyncjp}
}{}
- \renewcommand{\doclicense at imagemodifier}{}
}{}
\ifthenelse{\equal{\doclicense at modifier}{by-nc-sa}}{
\renewcommand{\doclicense at icon}{\ccbyncsa}
@@ -794,11 +801,11 @@
\ifthenelse{\equal{\doclicense at modifier}{pd}}{
\renewcommand{\doclicense at icon}{\ccpd}
\renewcommand{\doclicense at imagemodifier}{}
- \doclicense at setVersion[1.0]
+ \doclicense at setVersion[null]
\edef\doclicenseURL{%
\doclicense at baseUrlCC/%
- licenses/publicdomain/%
- \doclicense at versionUsed\doclicense at UrlLangPart}
+ licenses/publicdomain%
+ \doclicense at UrlLangPart}
}{}
\ifcsdef{doclicense at lang@lic@\doclicense at type%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{Copyright-Only Dedication}%
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Atribuição 3.0 Brasil}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Atribuição-CompartilhaIgual 3.0 Brasil}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-catalan.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-catalan.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-catalan.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -1,6 +1,6 @@
\ProvidesFile{doclicense-catalan.ldf}
-\@namedef{doclicense at lang@thisDoc}{Aquesta obra està sota una llicència}%
+\@namedef{doclicense at lang@thisDoc}{Aquesta obra està subjecta a una llicència de}%
\@namedef{doclicense at lang@word at license}{}%
\@namedef{doclicense at lang@lic at CC@code}{ca}%
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{Copyright-Only Dedication}%
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Reconeixement 3.0 No adaptada}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Reconeixement-CompartirIgual 3.0 No adaptada}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -7,7 +7,7 @@
%% Using:https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 ͨ\xD3\xC3}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{\xBD\xF6\xCF\xDE\xD3ڰ\xE6Ȩ\xB9\xB1\xCF\xD7}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{\xBD\xF6\xCF\xDE\xD3ڰ\xE6Ȩ\xB9\xB1\xCF\xD7}%
\@namedef{doclicense at lang@lic at CC@by at 3.0}{\xCA\xF0\xC3\xFB 3.0 \xD6й\xFA\xB4\xF3½}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{\xCA\xF0\xC3\xFB-\xCF\xE0ͬ\xB7\xBDʽ\xB9\xB2\xCF\xED 3.0 \xD6й\xFA\xB4\xF3½}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -7,7 +7,7 @@
%% Using:https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 通用}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{仅限于版权贡献}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{仅限于版权贡献}%
\@namedef{doclicense at lang@lic at CC@by at 3.0}{署名 3.0 中国大陆}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{署名-相同方式共享 3.0 中国大陆}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{Copyright-Only Dedication}%
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Attribution 3.0 Unported}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Attribution-ShareAlike 3.0 Unported}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -11,7 +11,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universel}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{Copyright-Only Dedication}%
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Attribution 3.0 non transpos\'e}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Attribution - Partage dans les m\^emes conditions 3.0 non transpos\'e}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-galician.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-galician.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-galician.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{Copyright-Only Dedication}%
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Recoñecemento 3.0 España}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Recoñecemento-CompartirIgual 3.0 España}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -10,7 +10,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universell}%
-% \@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
+% \@namedef{doclicense at lang@lic at CC@pd at null}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Namensnennung 3.0 Deutschland}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Namensnennung -- Weitergabe unter gleichen Bedingungen 3.0 Deutschland}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -10,7 +10,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universale}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
+\@namedef{doclicense at lang@lic at CC@pd at null}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Attribuzione 3.0 Italia}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Attribuzione -- Condividi allo stesso modo 3.0 Italia}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-polish.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-polish.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-polish.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -10,7 +10,7 @@
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{Przekazanie do Domeny Publicznej (CC0 1.0)}%
% https://creativecommons.org/publicdomain/zero/1.0/deed.pl
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Zaświadczenie Domeny Publicznej}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{Zaświadczenie Domeny Publicznej}%
% https://creativecommons.org/choose/publicdomain-2?lang=pl
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Uznanie autorstwa 3.0 Polska(CC BY 3.0 PL)}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{Copyright-Only Dedication}%
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Atribuição 3.0 Portugal}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Atribuição-CompartilhaIgual 3.0 Portugal}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Универсальная}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Отказ от своих прав в пользу общества с сохранением лишь неотъемлемых авторских прав (основано на законодательстве США)}% Инструмент списан, следует использовать CC0.
+\@namedef{doclicense at lang@lic at CC@pd at null}{Отказ от своих прав в пользу общества с сохранением лишь неотъемлемых авторских прав (основано на законодательстве США)}% Инструмент списан, следует использовать CC0.
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Attribution (Атрибуция) 3.0 Непортированная}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Attribution-ShareAlike (Атрибуция — На тех же условиях) 3.0 Непортированная}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf 2020-04-12 21:31:05 UTC (rev 54700)
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense at lang@lic at CC@pd at null}{Copyright-Only Dedication}%
\@namedef{doclicense at lang@lic at CC@by at 3.0}{Reconocimiento 3.0 España}%
\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Reconocimiento-CompartirIgual 3.0 España}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty 2020-04-12 21:29:46 UTC (rev 54699)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty 2020-04-12 21:31:05 UTC (rev 54700)
@@ -1,7 +1,7 @@
%% See file 'doclicense.dtx' for copyright and license.
\NeedsTeXFormat{LaTeX2e}[1998/12/01]
\ProvidesPackage{doclicense}
- [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]
%% ^^A nag warned about the center environment and it really messes up spacing.
%% Parameters (((
@@ -263,7 +263,6 @@
\ifthenelse{\equal{\doclicense at imagemodifier}{-jp}}{%
\renewcommand{\doclicense at icon}{\ccbyncjp}
}{}
- \renewcommand{\doclicense at imagemodifier}{}
}{}
\ifthenelse{\equal{\doclicense at modifier}{by-nc-sa}}{
\renewcommand{\doclicense at icon}{\ccbyncsa}
@@ -296,11 +295,11 @@
\ifthenelse{\equal{\doclicense at modifier}{pd}}{
\renewcommand{\doclicense at icon}{\ccpd}
\renewcommand{\doclicense at imagemodifier}{}
- \doclicense at setVersion[1.0]
+ \doclicense at setVersion[null]
\edef\doclicenseURL{%
\doclicense at baseUrlCC/%
- licenses/publicdomain/%
- \doclicense at versionUsed\doclicense at UrlLangPart}
+ licenses/publicdomain%
+ \doclicense at UrlLangPart}
}{}
\ifcsdef{doclicense at lang@lic@\doclicense at type%
More information about the tex-live-commits
mailing list.