From c98e9ebef816f09dc54c52a01df4f978e1b210fc Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 13 Apr 2020 03:03:00 +0000 Subject: CTAN sync 202004130303 --- .../contrib/doclicense/doclicense-brazilian.ldf | 2 +- .../contrib/doclicense/doclicense-catalan.ldf | 4 ++-- .../contrib/doclicense/doclicense-chinese-gbk.ldf | 2 +- .../contrib/doclicense/doclicense-chinese-utf8.ldf | 2 +- .../contrib/doclicense/doclicense-english.ldf | 2 +- .../latex/contrib/doclicense/doclicense-french.ldf | 2 +- .../contrib/doclicense/doclicense-galician.ldf | 2 +- .../latex/contrib/doclicense/doclicense-german.ldf | 2 +- .../contrib/doclicense/doclicense-italian.ldf | 2 +- .../latex/contrib/doclicense/doclicense-polish.ldf | 2 +- .../contrib/doclicense/doclicense-portuguese.ldf | 2 +- .../contrib/doclicense/doclicense-russian.ldf | 2 +- .../contrib/doclicense/doclicense-spanish.ldf | 2 +- macros/latex/contrib/doclicense/doclicense.dtx | 21 ++++++++++++++------- macros/latex/contrib/doclicense/doclicense.pdf | Bin 432792 -> 363774 bytes 15 files changed, 28 insertions(+), 21 deletions(-) (limited to 'macros/latex/contrib/doclicense') diff --git a/macros/latex/contrib/doclicense/doclicense-brazilian.ldf b/macros/latex/contrib/doclicense/doclicense-brazilian.ldf index be44d7b5b9..f801351a9d 100644 --- a/macros/latex/contrib/doclicense/doclicense-brazilian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-brazilian.ldf @@ -7,7 +7,7 @@ %% 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@pd@null}{Copyright-Only Dedication}% \@namedef{doclicense@lang@lic@CC@by@3.0}{Atribuição 3.0 Brasil}% \@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgual 3.0 Brasil}% diff --git a/macros/latex/contrib/doclicense/doclicense-catalan.ldf b/macros/latex/contrib/doclicense/doclicense-catalan.ldf index 0ce6fd0627..fa77e28021 100644 --- a/macros/latex/contrib/doclicense/doclicense-catalan.ldf +++ b/macros/latex/contrib/doclicense/doclicense-catalan.ldf @@ -1,13 +1,13 @@ \ProvidesFile{doclicense-catalan.ldf} -\@namedef{doclicense@lang@thisDoc}{Aquesta obra està sota una llicència}% +\@namedef{doclicense@lang@thisDoc}{Aquesta obra està subjecta a una llicència de}% \@namedef{doclicense@lang@word@license}{}% \@namedef{doclicense@lang@lic@CC@code}{ca}% %% 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@pd@null}{Copyright-Only Dedication}% \@namedef{doclicense@lang@lic@CC@by@3.0}{Reconeixement 3.0 No adaptada}% \@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Reconeixement-CompartirIgual 3.0 No adaptada}% diff --git a/macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf b/macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf index 00edc21da7..69c619490f 100644 --- a/macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf +++ b/macros/latex/contrib/doclicense/doclicense-chinese-gbk.ldf @@ -7,7 +7,7 @@ %% Using:https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 ͨ}% -\@namedef{doclicense@lang@lic@CC@pd@1.0}{ڰȨ}% +\@namedef{doclicense@lang@lic@CC@pd@null}{ڰȨ}% \@namedef{doclicense@lang@lic@CC@by@3.0}{ 3.0 й½}% \@namedef{doclicense@lang@lic@CC@by-sa@3.0}{-ͬʽ 3.0 й½}% diff --git a/macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf b/macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf index 344df189b0..348019c34c 100644 --- a/macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf +++ b/macros/latex/contrib/doclicense/doclicense-chinese-utf8.ldf @@ -7,7 +7,7 @@ %% Using:https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 通用}% -\@namedef{doclicense@lang@lic@CC@pd@1.0}{仅限于版权贡献}% +\@namedef{doclicense@lang@lic@CC@pd@null}{仅限于版权贡献}% \@namedef{doclicense@lang@lic@CC@by@3.0}{署名 3.0 中国大陆}% \@namedef{doclicense@lang@lic@CC@by-sa@3.0}{署名-相同方式共享 3.0 中国大陆}% diff --git a/macros/latex/contrib/doclicense/doclicense-english.ldf b/macros/latex/contrib/doclicense/doclicense-english.ldf index b3be5bf946..324169ad63 100644 --- a/macros/latex/contrib/doclicense/doclicense-english.ldf +++ b/macros/latex/contrib/doclicense/doclicense-english.ldf @@ -7,7 +7,7 @@ %% 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@pd@null}{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}% diff --git a/macros/latex/contrib/doclicense/doclicense-french.ldf b/macros/latex/contrib/doclicense/doclicense-french.ldf index 93ed57e0ab..8e0c81e5a5 100644 --- a/macros/latex/contrib/doclicense/doclicense-french.ldf +++ b/macros/latex/contrib/doclicense/doclicense-french.ldf @@ -11,7 +11,7 @@ %% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universel}% -\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}% +\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}% \@namedef{doclicense@lang@lic@CC@by@3.0}{Attribution 3.0 non transpos\'e}% \@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution - Partage dans les m\^emes conditions 3.0 non transpos\'e}% diff --git a/macros/latex/contrib/doclicense/doclicense-galician.ldf b/macros/latex/contrib/doclicense/doclicense-galician.ldf index 15fe985b8b..e7c00f24aa 100644 --- a/macros/latex/contrib/doclicense/doclicense-galician.ldf +++ b/macros/latex/contrib/doclicense/doclicense-galician.ldf @@ -7,7 +7,7 @@ %% 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@pd@null}{Copyright-Only Dedication}% \@namedef{doclicense@lang@lic@CC@by@3.0}{Recoñecemento 3.0 España}% \@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Recoñecemento-CompartirIgual 3.0 España}% diff --git a/macros/latex/contrib/doclicense/doclicense-german.ldf b/macros/latex/contrib/doclicense/doclicense-german.ldf index 7bf7ce940c..f0e5ba15c4 100644 --- a/macros/latex/contrib/doclicense/doclicense-german.ldf +++ b/macros/latex/contrib/doclicense/doclicense-german.ldf @@ -10,7 +10,7 @@ %% 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. +% \@namedef{doclicense@lang@lic@CC@pd@null}{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}% diff --git a/macros/latex/contrib/doclicense/doclicense-italian.ldf b/macros/latex/contrib/doclicense/doclicense-italian.ldf index 7f8abfea4c..1831fe137c 100644 --- a/macros/latex/contrib/doclicense/doclicense-italian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-italian.ldf @@ -10,7 +10,7 @@ %% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universale}% -\@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@pd@null}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries. \@namedef{doclicense@lang@lic@CC@by@3.0}{Attribuzione 3.0 Italia}% \@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribuzione -- Condividi allo stesso modo 3.0 Italia}% diff --git a/macros/latex/contrib/doclicense/doclicense-polish.ldf b/macros/latex/contrib/doclicense/doclicense-polish.ldf index 515ecca640..1097b4e98a 100644 --- a/macros/latex/contrib/doclicense/doclicense-polish.ldf +++ b/macros/latex/contrib/doclicense/doclicense-polish.ldf @@ -10,7 +10,7 @@ \@namedef{doclicense@lang@lic@CC@zero@1.0}{Przekazanie do Domeny Publicznej (CC0 1.0)}% % https://creativecommons.org/publicdomain/zero/1.0/deed.pl -\@namedef{doclicense@lang@lic@CC@pd@1.0}{Zaświadczenie Domeny Publicznej}% +\@namedef{doclicense@lang@lic@CC@pd@null}{Zaświadczenie Domeny Publicznej}% % https://creativecommons.org/choose/publicdomain-2?lang=pl \@namedef{doclicense@lang@lic@CC@by@3.0}{Uznanie autorstwa 3.0 Polska(CC BY 3.0 PL)}% diff --git a/macros/latex/contrib/doclicense/doclicense-portuguese.ldf b/macros/latex/contrib/doclicense/doclicense-portuguese.ldf index 99192c90e6..be5b4d30a6 100644 --- a/macros/latex/contrib/doclicense/doclicense-portuguese.ldf +++ b/macros/latex/contrib/doclicense/doclicense-portuguese.ldf @@ -7,7 +7,7 @@ %% 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@pd@null}{Copyright-Only Dedication}% \@namedef{doclicense@lang@lic@CC@by@3.0}{Atribuição 3.0 Portugal}% \@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgual 3.0 Portugal}% diff --git a/macros/latex/contrib/doclicense/doclicense-russian.ldf b/macros/latex/contrib/doclicense/doclicense-russian.ldf index 0e5385e0fe..f08ae2fa9d 100644 --- a/macros/latex/contrib/doclicense/doclicense-russian.ldf +++ b/macros/latex/contrib/doclicense/doclicense-russian.ldf @@ -7,7 +7,7 @@ %% Using: https://en.wikipedia.org/wiki/ISO_639-1 \@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Универсальная}% -\@namedef{doclicense@lang@lic@CC@pd@1.0}{Отказ от своих прав в пользу общества с сохранением лишь неотъемлемых авторских прав (основано на законодательстве США)}% Инструмент списан, следует использовать CC0. +\@namedef{doclicense@lang@lic@CC@pd@null}{Отказ от своих прав в пользу общества с сохранением лишь неотъемлемых авторских прав (основано на законодательстве США)}% Инструмент списан, следует использовать CC0. \@namedef{doclicense@lang@lic@CC@by@3.0}{Attribution (Атрибуция) 3.0 Непортированная}% \@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution-ShareAlike (Атрибуция — На тех же условиях) 3.0 Непортированная}% diff --git a/macros/latex/contrib/doclicense/doclicense-spanish.ldf b/macros/latex/contrib/doclicense/doclicense-spanish.ldf index d7d5de7abd..91f2bddbba 100644 --- a/macros/latex/contrib/doclicense/doclicense-spanish.ldf +++ b/macros/latex/contrib/doclicense/doclicense-spanish.ldf @@ -7,7 +7,7 @@ %% 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@pd@null}{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}% diff --git a/macros/latex/contrib/doclicense/doclicense.dtx b/macros/latex/contrib/doclicense/doclicense.dtx index df2b141bf1..3d262e9942 100644 --- a/macros/latex/contrib/doclicense/doclicense.dtx +++ b/macros/latex/contrib/doclicense/doclicense.dtx @@ -27,7 +27,7 @@ %\NeedsTeXFormat{LaTeX2e}[1998/12/01] %\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] % % %<*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% diff --git a/macros/latex/contrib/doclicense/doclicense.pdf b/macros/latex/contrib/doclicense/doclicense.pdf index 8548d6676a..8c60c033cc 100644 Binary files a/macros/latex/contrib/doclicense/doclicense.pdf and b/macros/latex/contrib/doclicense/doclicense.pdf differ -- cgit v1.2.3