summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-06 21:49:13 +0000
committerKarl Berry <karl@freefriends.org>2019-06-06 21:49:13 +0000
commit9de8d0c86f1c4b876080a3374d923c92876f56ac (patch)
tree567a862047780913fa0e97fa146d21d8a0d354da
parent79fbe27423e43f95ee32ae7dbc3f6fc3cb09ad8b (diff)
doclicense (6jun19)
git-svn-id: svn://tug.org/texlive/trunk@51332 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/doclicense/doclicense.pdfbin432958 -> 432792 bytes
-rw-r--r--Master/texmf-dist/source/latex/doclicense/doclicense.dtx25
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf24
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf24
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf (renamed from Master/texmf-dist/tex/latex/doclicense/doclicense-chinese.ldf)12
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf4
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense.sty20
7 files changed, 82 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf b/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
index fc570fc5e41..8548d6676a4 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/source/latex/doclicense/doclicense.dtx b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
index b10b5a82c7d..df2b141bf11 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/04/07 v1.9.0 Support for putting documents under a license]
+ [2019/06/05 v1.10.0 Support for putting documents under a license]
%</package>
%
%<*driver>
@@ -126,7 +126,8 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
% \changes{1.7.0}{2018/02/17}{Update Russian and Spanish translation. Fix issue with unescaped newline causing two spaces between license name and 'license' word.}
% \changes{1.7.1}{2018/04/24}{Include .eps versions of the images to allow using `latex` with dvi output. Thanks to robertpetry for reporting.}
% \changes{1.8.0}{2018/06/10}{Added Polish translation.}
-% \changes{1.9.0}{2018/12/20}{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.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).}
%
%% ^^A nag warned about the center environment and it really messes up spacing.
%
@@ -219,6 +220,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
% Supported languages:
% ^^A Sorted alphabetically.
% \begin{eqlist}
+% \item[Brazilian] Added by \href{https://github.com/iagows}{Iago}.
% \item[Catalan] Added by \href{https://github.com/elancha98}{Ernesto Lanchares}.
% \item[Chinese] Added by \href{https://github.com/sd44}{sd44}.
% \item[English] Added by \href{https://github.com/ypid}{Robin Schneider}.
@@ -233,6 +235,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
%
%
%
+%
% \end{eqlist}
%
% Image position for \cmd{\doclicenseThis}: right (default) or left.
@@ -503,15 +506,17 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
\RequirePackage{etoolbox} %% \ifcsdef
\RequirePackage{xspace}
\RequirePackage{verbatim}
-\RequirePackage{enumitem}
+%% )))
-%% \setlistdepth{4} seems not to be needed. Try without it to avoid changing global variables.
-%% Enumeration scheme was chosen to match the html page once.
-\newlist{doclicense@enumerate}{enumerate}{4}
-\setlist[doclicense@enumerate,1]{label = (\alph*)}
-\setlist[doclicense@enumerate,2]{label = (\arabic*)}
-\setlist[doclicense@enumerate,3]{label = (\Alph*)}
-\setlist[doclicense@enumerate,4]{label = (\roman*)}
+%% Custom enumerate list with adjusted labels
+%% that match the license text convetions
+\newenvironment{doclicense@enumerate}{%
+ \begin{enumerate}
+ \renewcommand{\labelenumi}{(\alph{enumi})}%
+ \renewcommand{\labelenumii}{(\arabic{enumii})}%
+ \renewcommand{\labelenumiii}{(\Alph{enumiii})}%
+ \renewcommand{\labelenumiv}{(\roman{enumiv})}%
+}{\end{enumerate}}
\ifthenelse{
\equal{\doclicense@hyphenation}{}
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
new file mode 100644
index 00000000000..be44d7b5b98
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-brazilian.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{Essa obra tem a licença}%
+\@namedef{doclicense@lang@word@license}{}%
+
+\@namedef{doclicense@lang@lic@CC@code}{pt}%
+%% 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@by@3.0}{Atribuição 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgual 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Atribuição-SemDerivações 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Atribuição-NãoComercial 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Atribuição-NãoComercial-CompartilhaIgual 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Atribuição-NãoComercial-SemDerivações 3.0 Brasil}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{Atribuição 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Atribuição-CompartilhaIgual 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{Atribuição-SemDerivações 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{Atribuição-NãoComercial 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{Atribuição-NãoComercial-CompartilhaIgual 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{Atribuição-NãoComercial-SemDerivações 4.0 Internacional}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf
new file mode 100644
index 00000000000..00edc21da75
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-chinese.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{Ʒ}%
+\@namedef{doclicense@lang@word@license}{Э}%
+
+\@namedef{doclicense@lang@lic@CC@code}{zh}%
+%% 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@by@3.0}{ 3.0 й½}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{-ͬʽ 3.0 й½}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{-ֹ 3.0 й½}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{-ҵʹ 3.0 й½}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{-ҵʹ-ͬʽ 3.0 й½}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{-ҵʹ-ֹ 3.0 й½}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{ 4.0 }%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{-ͬʽ 4.0 }%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{-ֹ 4.0 }%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{-ҵʹ 4.0 }%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{-ҵʹ-ͬʽ 4.0 }%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{-ҵʹ-ֹ 4.0 }%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf
index 2f6a3d5f06d..344df189b00 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese.ldf
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf
@@ -9,12 +9,12 @@
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 通用}%
\@namedef{doclicense@lang@lic@CC@pd@1.0}{仅限于版权贡献}%
-\@namedef{doclicense@lang@lic@CC@by@3.0}{署名 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{署名-相同方式共享 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{署名-禁止演绎 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{署名-非商业性使用 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{署名-非商业性使用-相同方式共享 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{署名-非商业性使用-禁止演绎 3.0 未本地化版本}%
+\@namedef{doclicense@lang@lic@CC@by@3.0}{署名 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{署名-相同方式共享 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{署名-禁止演绎 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{署名-非商业性使用 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{署名-非商业性使用-相同方式共享 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{署名-非商业性使用-禁止演绎 3.0 中国大陆}%
\@namedef{doclicense@lang@lic@CC@by@4.0}{署名 4.0 国际}%
\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{署名-相同方式共享 4.0 国际}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf
index cc558522cd2..99192c90e64 100644
--- a/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf
@@ -10,11 +10,11 @@
\@namedef{doclicense@lang@lic@CC@pd@1.0}{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-CompartilhaIgua 3.0 Portugal}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgual 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Atribuição-SemDerivações 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Atribuição-NãoComercial 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Atribuição-NãoComercial-CompartilhaIgual 3.0 Portugal}%
-\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Atribuição-NãoComercial-SemDerivaçõe 3.0 Portugal}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Atribuição-NãoComercial-SemDerivações 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by@4.0}{Atribuição 4.0 Internacional}%
\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Atribuição-CompartilhaIgual 4.0 Internacional}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
index d16ba96ee6f..c4a6ee73bad 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/04/07 v1.9.0 Support for putting documents under a license]
+ [2019/06/05 v1.10.0 Support for putting documents under a license]
%% ^^A nag warned about the center environment and it really messes up spacing.
%% Parameters (((
@@ -24,15 +24,17 @@
\RequirePackage{etoolbox} %% \ifcsdef
\RequirePackage{xspace}
\RequirePackage{verbatim}
-\RequirePackage{enumitem}
+%% )))
-%% \setlistdepth{4} seems not to be needed. Try without it to avoid changing global variables.
-%% Enumeration scheme was chosen to match the html page once.
-\newlist{doclicense@enumerate}{enumerate}{4}
-\setlist[doclicense@enumerate,1]{label = (\alph*)}
-\setlist[doclicense@enumerate,2]{label = (\arabic*)}
-\setlist[doclicense@enumerate,3]{label = (\Alph*)}
-\setlist[doclicense@enumerate,4]{label = (\roman*)}
+%% Custom enumerate list with adjusted labels
+%% that match the license text convetions
+\newenvironment{doclicense@enumerate}{%
+ \begin{enumerate}
+ \renewcommand{\labelenumi}{(\alph{enumi})}%
+ \renewcommand{\labelenumii}{(\arabic{enumii})}%
+ \renewcommand{\labelenumiii}{(\Alph{enumiii})}%
+ \renewcommand{\labelenumiv}{(\roman{enumiv})}%
+}{\end{enumerate}}
\ifthenelse{
\equal{\doclicense@hyphenation}{}