summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-05-19 20:14:47 +0000
committerKarl Berry <karl@freefriends.org>2022-05-19 20:14:47 +0000
commite1ceeddbdc871c1dbba8656cde172fa3a7b9ad79 (patch)
treec7d7a8140f7cca063ba58e3adb04ebb5f56b253d /Master
parent0068dc20e7132f24c1bb68957ef6ad5ea5b46157 (diff)
doclicense (19may22)
git-svn-id: svn://tug.org/texlive/trunk@63340 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/doclicense/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/doclicense/doclicense.pdfbin273455 -> 274374 bytes
-rw-r--r--Master/texmf-dist/doc/latex/doclicense/manifest.txt3
-rw-r--r--Master/texmf-dist/source/latex/doclicense/Makefile14
-rw-r--r--Master/texmf-dist/source/latex/doclicense/doclicense.dtx4
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-ukrainian.ldf30
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense.sty2
7 files changed, 49 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/doclicense/README.md b/Master/texmf-dist/doc/latex/doclicense/README.md
index 34361a1192c..28f2a97336a 100644
--- a/Master/texmf-dist/doc/latex/doclicense/README.md
+++ b/Master/texmf-dist/doc/latex/doclicense/README.md
@@ -1,5 +1,5 @@
<!--
-SPDX-FileCopyrightText: 2015,2021 Robin Schneider <ypid@riseup.net>
+SPDX-FileCopyrightText: 2015,2017-2022 Robin Schneider <ypid@riseup.net>
SPDX-License-Identifier: LPPL-1.3c
diff --git a/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf b/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
index 07310c4324e..7caa7b0c801 100644
--- a/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
+++ b/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/doclicense/manifest.txt b/Master/texmf-dist/doc/latex/doclicense/manifest.txt
index 247db4fe0d7..b634e01997e 100644
--- a/Master/texmf-dist/doc/latex/doclicense/manifest.txt
+++ b/Master/texmf-dist/doc/latex/doclicense/manifest.txt
@@ -21,6 +21,7 @@ doclicense/doclicense-chinese-utf8.ldf
doclicense/doclicense-croatian.ldf
doclicense/doclicense.dtx
doclicense/doclicense-english.ldf
+doclicense/doclicense-esperanto.ldf
doclicense/doclicense-french.ldf
doclicense/doclicense-galician.ldf
doclicense/doclicense-german.ldf
@@ -34,7 +35,9 @@ doclicense/doclicense-polish.ldf
doclicense/doclicense-portuguese.ldf
doclicense/doclicense-russian.ldf
doclicense/doclicense-spanish.ldf
+doclicense/doclicense-swedish.ldf
doclicense/doclicense-UKenglish.ldf
+doclicense/doclicense-ukrainian.ldf
doclicense/doclicense-USenglish.ldf
doclicense/images/doclicense-CC-by-80x15.eps
doclicense/images/doclicense-CC-by-80x15.pdf
diff --git a/Master/texmf-dist/source/latex/doclicense/Makefile b/Master/texmf-dist/source/latex/doclicense/Makefile
index bfa65debc3f..9f00b5930d0 100644
--- a/Master/texmf-dist/source/latex/doclicense/Makefile
+++ b/Master/texmf-dist/source/latex/doclicense/Makefile
@@ -22,10 +22,18 @@ install:
mkdir --parents "$(TEXMFHOME)/tex/latex/"
test -L "$(TEXMFHOME)/tex/latex/doclicense" || ln --no-target-directory --symbolic "$$PWD" "$(TEXMFHOME)/tex/latex/doclicense"
-# Run before release.
.PHONY: check
-check: run_tests doclicense.sty lint
- ./"$<"
+check: check-copyright-date manifest.txt doclicense.sty lint
+
+# Run before release.
+.PHONY: check-full
+check-full: check run_tests
+ ./run_tests
+
+# CTAN people want this when uploading a release.
+.PHONY: check-copyright-date
+check-copyright-date: README.md
+ grep --quiet 'SPDX-FileCopyrightText:.*$(shell date +%Y)\s' "$<"
.PHONY: lint
lint: doclicense.dtx
diff --git a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
index f858db9c8de..e0dddf762ad 100644
--- a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
+++ b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
@@ -24,7 +24,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1998/12/01]
%<package>\ProvidesPackage{doclicense}
%<*package>
- [2022/04/27 v3.1.0 Support for putting documents under a license]
+ [2022/05/18 v3.2.0 Support for putting documents under a license]
%</package>
%
%<*driver>
@@ -138,6 +138,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed
% \changes{2.3.0}{2021/03/13}{Add option to disable the use of hyperxmp and add compatibility for pdfx. Use \url{https://reuse.software/} for the doclicense source code itself.}
% \changes{3.0.0}{2021/07/11}{Breaking change: Hard require package options "type", "modifier" and "version" now after one year in soft require migration period. Add Croatian translation. Add sections to docs about choosing a license and the REUSE specification. Update Spanish translation to match Creative Commons website. Add note to README that CC license texts and images are licensed themselves under CC0-1.0. Load csquotes after hyperref to avoid hyperref warning. Do not load the hyperxmp package if the silence package is loaded to avoid an endless loop. Improve warning messages generated by the package. Add "Dependency packages and load order" section to docs.}
% \changes{3.1.0}{2022/04/27}{Add macro \cmd{\doclicenseLongTextForHyperref} and use it inside \cmd{\hypersetup} to replace the fagile code that was previously used. Add Traditional Chinese (Taiwan), Swedish and Esperanto translations.}
+% \changes{3.2.0}{2022/05/18}{Add Ukrainian translation.}
%
%
%
@@ -288,6 +289,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \printdateTeX{\filed
% \item Russian
% \item Spanish
% \item Swedish
+% \item Ukrainian
% \end{itemize}
%
% Image position for \cmd{\doclicenseThis}: right (default) or left.
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-ukrainian.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-ukrainian.ldf
new file mode 100644
index 00000000000..a1936b0acc8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-ukrainian.ldf
@@ -0,0 +1,30 @@
+% SPDX-FileCopyrightText: 2022 Boris Veytsman <borisv@lk.net>
+%
+% SPDX-License-Identifier: LPPL-1.3c
+%
+% This work consists of all files listed in manifest.txt.
+% For more details about the licensing, refer to the README.md file.
+
+\ProvidesFile{doclicense-ukrainian.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{Цей матеріал доступний на умовах ліцензії}%
+\@namedef{doclicense@lang@word@license}{}%
+
+\@namedef{doclicense@lang@lic@CC@code}{uk}%
+% 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@by@3.0}{Attribution (Із Зазначенням Авторства) 3.0 Непортована Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution-ShareAlike (Із Зазначенням Авторства---Поширення На Тих Самих Умовах) 3.0 Непортована Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Attribution-NoDerivs (Із Зазначенням Авторства---Без Похідних) 3.0 Непортована Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Attribution-NonCommercial (Із Зазначенням Авторства---Некомерційна) 3.0 Непортована Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Attribution-NonCommercial-ShareAlike (Із Зазначенням Авторства---Некомерційна---Поширення На Тих Самих Умовах) 3.0 Непортована Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Attribution-NonCommercial-NoDerivs (Із Зазначенням Авторства---Некомерційна---Без Похідних) 3.0 Непортована Публічна Ліцензія}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{Attribution (Із Зазначенням Авторства) 4.0 Міжнародна Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Attribution-ShareAlike (Із Зазначенням Авторства---Поширення На Тих Самих Умовах) 4.0 Міжнародна Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{Attribution-NoDerivs (Із Зазначенням Авторства---Без Похідних) 4.0 Міжнародна Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{Attribution-NonCommercial (Із Зазначенням Авторства---Некомерційна) 4.0 Міжнародна Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{Attribution-NonCommercial-ShareAlike (Із Зазначенням Авторства---Некомерційна---Поширення На Тих Самих Умовах) 4.0 Міжнародна Публічна Ліцензія}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{Attribution-NonCommercial-NoDerivs (Із Зазначенням Авторства---Некомерційна---Без Похідних) 4.0 Міжнародна Публічна Ліцензія}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
index ce723991582..321b3ad4536 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
@@ -8,7 +8,7 @@
\NeedsTeXFormat{LaTeX2e}[1998/12/01]
\ProvidesPackage{doclicense}
- [2022/04/27 v3.1.0 Support for putting documents under a license]
+ [2022/05/18 v3.2.0 Support for putting documents under a license]
\RequirePackage{kvoptions}
\DeclareStringOption{type}