summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/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/tex/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/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-catalan.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-galician.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-polish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense.sty9
14 files changed, 18 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
index be44d7b5b98..f801351a9d9 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-catalan.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-catalan.ldf
index 0ce6fd06272..fa77e28021d 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-catalan.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf
index 00edc21da75..69c619490fa 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf
index 344df189b00..348019c34c8 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
index b3be5bf946e..324169ad63c 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-english.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf
index 93ed57e0ab6..8e0c81e5a50 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-galician.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-galician.ldf
index 15fe985b8b1..e7c00f24aa7 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-galician.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
index 7bf7ce940c4..f0e5ba15c49 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-german.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf
index 7f8abfea4c9..1831fe137cc 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-polish.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-polish.ldf
index 515ecca6402..1097b4e98a5 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-polish.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf
index 99192c90e64..be5b4d30a60 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf
index 0e5385e0fef..f08ae2fa9db 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf
index d7d5de7abdd..91f2bddbba5 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-spanish.ldf
+++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/doclicense/doclicense.sty b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
index c4a6ee73bad..e277e15c0c1 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}
- [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@imagemodifier}{-jp}}{%
\renewcommand{\doclicense@icon}{\ccbyncjp}
}{}
- \renewcommand{\doclicense@imagemodifier}{}
}{}
\ifthenelse{\equal{\doclicense@modifier}{by-nc-sa}}{
\renewcommand{\doclicense@icon}{\ccbyncsa}
@@ -296,11 +295,11 @@
\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%