texlive[51332] Master/texmf-dist: doclicense (6jun19)
commits+karl at tug.org
commits+karl at tug.org
Thu Jun 6 23:49:14 CEST 2019
Revision: 51332
http://tug.org/svn/texlive?view=revision&revision=51332
Author: karl
Date: 2019-06-06 23:49:13 +0200 (Thu, 06 Jun 2019)
Log Message:
-----------
doclicense (6jun19)
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-portuguese.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese.ldf
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 2019-06-06 21:49:00 UTC (rev 51331)
+++ trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx 2019-06-06 21:49:13 UTC (rev 51332)
@@ -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 @@
% \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 @@
% 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 @@
%
%
%
+%
% \end{eqlist}
%
% Image position for \cmd{\doclicenseThis}: right (default) or left.
@@ -503,15 +506,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 at enumerate}{enumerate}{4}
-\setlist[doclicense at enumerate,1]{label = (\alph*)}
-\setlist[doclicense at enumerate,2]{label = (\arabic*)}
-\setlist[doclicense at enumerate,3]{label = (\Alph*)}
-\setlist[doclicense at enumerate,4]{label = (\roman*)}
+%% Custom enumerate list with adjusted labels
+%% that match the license text convetions
+\newenvironment{doclicense at enumerate}{%
+ \begin{enumerate}
+ \renewcommand{\labelenumi}{(\alph{enumi})}%
+ \renewcommand{\labelenumii}{(\arabic{enumii})}%
+ \renewcommand{\labelenumiii}{(\Alph{enumiii})}%
+ \renewcommand{\labelenumiv}{(\roman{enumiv})}%
+}{\end{enumerate}}
\ifthenelse{
\equal{\doclicense at hyphenation}{}
Added: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf 2019-06-06 21:49:13 UTC (rev 51332)
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-brazilian.ldf}
+
+\@namedef{doclicense at lang@thisDoc}{Essa obra tem a licença}%
+\@namedef{doclicense at lang@word at license}{}%
+
+\@namedef{doclicense at lang@lic at CC@code}{pt}%
+%% 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@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}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 3.0}{Atribuição-SemDerivações 3.0 Brasil}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 3.0}{Atribuição-NãoComercial 3.0 Brasil}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 3.0}{Atribuição-NãoComercial-CompartilhaIgual 3.0 Brasil}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 3.0}{Atribuição-NãoComercial-SemDerivações 3.0 Brasil}%
+
+\@namedef{doclicense at lang@lic at CC@by at 4.0}{Atribuição 4.0 Internacional}%
+\@namedef{doclicense at lang@lic at CC@by-sa at 4.0}{Atribuição-CompartilhaIgual 4.0 Internacional}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 4.0}{Atribuição-SemDerivações 4.0 Internacional}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 4.0}{Atribuição-NãoComercial 4.0 Internacional}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 4.0}{Atribuição-NãoComercial-CompartilhaIgual 4.0 Internacional}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 4.0}{Atribuição-NãoComercial-SemDerivações 4.0 Internacional}%
Property changes on: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-brazilian.ldf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf 2019-06-06 21:49:13 UTC (rev 51332)
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-chinese.ldf}
+
+\@namedef{doclicense at lang@thisDoc}{\xB1\xBE\xD7\xF7Ʒ\xB2\xC9\xD3\xC3}%
+\@namedef{doclicense at lang@word at license}{\xD0\xED\xBF\xC9Э\xD2\xE9\xBD\xF8\xD0\xD0\xD0\xED\xBF\xC9}%
+
+\@namedef{doclicense at lang@lic at CC@code}{zh}%
+%% 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@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½}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 3.0}{\xCA\xF0\xC3\xFB-\xBD\xFBֹ\xD1\xDD\xD2\xEF 3.0 \xD6й\xFA\xB4\xF3½}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 3.0}{\xCA\xF0\xC3\xFB-\xB7\xC7\xC9\xCCҵ\xD0\xD4ʹ\xD3\xC3 3.0 \xD6й\xFA\xB4\xF3½}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 3.0}{\xCA\xF0\xC3\xFB-\xB7\xC7\xC9\xCCҵ\xD0\xD4ʹ\xD3\xC3-\xCF\xE0ͬ\xB7\xBDʽ\xB9\xB2\xCF\xED 3.0 \xD6й\xFA\xB4\xF3½}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 3.0}{\xCA\xF0\xC3\xFB-\xB7\xC7\xC9\xCCҵ\xD0\xD4ʹ\xD3\xC3-\xBD\xFBֹ\xD1\xDD\xD2\xEF 3.0 \xD6й\xFA\xB4\xF3½}%
+
+\@namedef{doclicense at lang@lic at CC@by at 4.0}{\xCA\xF0\xC3\xFB 4.0 \xB9\xFA\xBC\xCA}%
+\@namedef{doclicense at lang@lic at CC@by-sa at 4.0}{\xCA\xF0\xC3\xFB-\xCF\xE0ͬ\xB7\xBDʽ\xB9\xB2\xCF\xED 4.0 \xB9\xFA\xBC\xCA}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 4.0}{\xCA\xF0\xC3\xFB-\xBD\xFBֹ\xD1\xDD\xD2\xEF 4.0 \xB9\xFA\xBC\xCA}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 4.0}{\xCA\xF0\xC3\xFB-\xB7\xC7\xC9\xCCҵ\xD0\xD4ʹ\xD3\xC3 4.0 \xB9\xFA\xBC\xCA}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 4.0}{\xCA\xF0\xC3\xFB-\xB7\xC7\xC9\xCCҵ\xD0\xD4ʹ\xD3\xC3-\xCF\xE0ͬ\xB7\xBDʽ\xB9\xB2\xCF\xED 4.0 \xB9\xFA\xBC\xCA}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 4.0}{\xCA\xF0\xC3\xFB-\xB7\xC7\xC9\xCCҵ\xD0\xD4ʹ\xD3\xC3-\xBD\xFBֹ\xD1\xDD\xD2\xEF 4.0 \xB9\xFA\xBC\xCA}%
Property changes on: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-gbk.ldf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf 2019-06-06 21:49:13 UTC (rev 51332)
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-chinese.ldf}
+
+\@namedef{doclicense at lang@thisDoc}{本作品采用}%
+\@namedef{doclicense at lang@word at license}{许可协议进行许可}%
+
+\@namedef{doclicense at lang@lic at CC@code}{zh}%
+%% 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@by at 3.0}{署名 3.0 中国大陆}%
+\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{署名-相同方式共享 3.0 中国大陆}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 3.0}{署名-禁止演绎 3.0 中国大陆}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 3.0}{署名-非商业性使用 3.0 中国大陆}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 3.0}{署名-非商业性使用-相同方式共享 3.0 中国大陆}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 3.0}{署名-非商业性使用-禁止演绎 3.0 中国大陆}%
+
+\@namedef{doclicense at lang@lic at CC@by at 4.0}{署名 4.0 国际}%
+\@namedef{doclicense at lang@lic at CC@by-sa at 4.0}{署名-相同方式共享 4.0 国际}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 4.0}{署名-禁止演绎 4.0 国际}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 4.0}{署名-非商业性使用 4.0 国际}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 4.0}{署名-非商业性使用-相同方式共享 4.0 国际}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 4.0}{署名-非商业性使用-禁止演绎 4.0 国际}%
Property changes on: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese-utf8.ldf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese.ldf 2019-06-06 21:49:00 UTC (rev 51331)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-chinese.ldf 2019-06-06 21:49:13 UTC (rev 51332)
@@ -1,24 +0,0 @@
-\ProvidesFile{doclicense-chinese.ldf}
-
-\@namedef{doclicense at lang@thisDoc}{本作品采用}%
-\@namedef{doclicense at lang@word at license}{许可协议进行许可}%
-
-\@namedef{doclicense at lang@lic at CC@code}{zh}%
-%% 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@by at 3.0}{署名 3.0 未本地化版本}%
-\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{署名-相同方式共享 3.0 未本地化版本}%
-\@namedef{doclicense at lang@lic at CC@by-nd at 3.0}{署名-禁止演绎 3.0 未本地化版本}%
-\@namedef{doclicense at lang@lic at CC@by-nc at 3.0}{署名-非商业性使用 3.0 未本地化版本}%
-\@namedef{doclicense at lang@lic at CC@by-nc-sa at 3.0}{署名-非商业性使用-相同方式共享 3.0 未本地化版本}%
-\@namedef{doclicense at lang@lic at CC@by-nc-nd at 3.0}{署名-非商业性使用-禁止演绎 3.0 未本地化版本}%
-
-\@namedef{doclicense at lang@lic at CC@by at 4.0}{署名 4.0 国际}%
-\@namedef{doclicense at lang@lic at CC@by-sa at 4.0}{署名-相同方式共享 4.0 国际}%
-\@namedef{doclicense at lang@lic at CC@by-nd at 4.0}{署名-禁止演绎 4.0 国际}%
-\@namedef{doclicense at lang@lic at CC@by-nc at 4.0}{署名-非商业性使用 4.0 国际}%
-\@namedef{doclicense at lang@lic at CC@by-nc-sa at 4.0}{署名-非商业性使用-相同方式共享 4.0 国际}%
-\@namedef{doclicense at lang@lic at CC@by-nc-nd at 4.0}{署名-非商业性使用-禁止演绎 4.0 国际}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf 2019-06-06 21:49:00 UTC (rev 51331)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-portuguese.ldf 2019-06-06 21:49:13 UTC (rev 51332)
@@ -10,11 +10,11 @@
\@namedef{doclicense at lang@lic at CC@pd at 1.0}{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-CompartilhaIgua 3.0 Portugal}%
+\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Atribuição-CompartilhaIgual 3.0 Portugal}%
\@namedef{doclicense at lang@lic at CC@by-nd at 3.0}{Atribuição-SemDerivações 3.0 Portugal}%
\@namedef{doclicense at lang@lic at CC@by-nc at 3.0}{Atribuição-NãoComercial 3.0 Portugal}%
\@namedef{doclicense at lang@lic at CC@by-nc-sa at 3.0}{Atribuição-NãoComercial-CompartilhaIgual 3.0 Portugal}%
-\@namedef{doclicense at lang@lic at CC@by-nc-nd at 3.0}{Atribuição-NãoComercial-SemDerivaçõe 3.0 Portugal}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 3.0}{Atribuição-NãoComercial-SemDerivações 3.0 Portugal}%
\@namedef{doclicense at lang@lic at CC@by at 4.0}{Atribuição 4.0 Internacional}%
\@namedef{doclicense at lang@lic at CC@by-sa at 4.0}{Atribuição-CompartilhaIgual 4.0 Internacional}%
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty 2019-06-06 21:49:00 UTC (rev 51331)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty 2019-06-06 21:49:13 UTC (rev 51332)
@@ -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 at enumerate}{enumerate}{4}
-\setlist[doclicense at enumerate,1]{label = (\alph*)}
-\setlist[doclicense at enumerate,2]{label = (\arabic*)}
-\setlist[doclicense at enumerate,3]{label = (\Alph*)}
-\setlist[doclicense at enumerate,4]{label = (\roman*)}
+%% Custom enumerate list with adjusted labels
+%% that match the license text convetions
+\newenvironment{doclicense at enumerate}{%
+ \begin{enumerate}
+ \renewcommand{\labelenumi}{(\alph{enumi})}%
+ \renewcommand{\labelenumii}{(\arabic{enumii})}%
+ \renewcommand{\labelenumiii}{(\Alph{enumiii})}%
+ \renewcommand{\labelenumiv}{(\roman{enumiv})}%
+}{\end{enumerate}}
\ifthenelse{
\equal{\doclicense at hyphenation}{}
More information about the tex-live-commits
mailing list