texlive[45495] Master/texmf-dist: doclicense (7oct17)
commits+karl at tug.org
commits+karl at tug.org
Sun Oct 8 00:11:57 CEST 2017
Revision: 45495
http://tug.org/svn/texlive?view=revision&revision=45495
Author: karl
Date: 2017-10-08 00:11:56 +0200 (Sun, 08 Oct 2017)
Log Message:
-----------
doclicense (7oct17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/doclicense/README
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.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf
trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf
Modified: trunk/Master/texmf-dist/doc/latex/doclicense/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/doclicense/README 2017-10-07 22:11:37 UTC (rev 45494)
+++ trunk/Master/texmf-dist/doc/latex/doclicense/README 2017-10-07 22:11:56 UTC (rev 45495)
@@ -1,6 +1,6 @@
LaTeX package 'doclicense'
~~~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (C) 2015 by Robin Schneider <ypid at riseup.net>
+Copyright (C) 2015-2017 by Robin Schneider <ypid at riseup.net>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
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 2017-10-07 22:11:37 UTC (rev 45494)
+++ trunk/Master/texmf-dist/source/latex/doclicense/doclicense.dtx 2017-10-07 22:11:56 UTC (rev 45495)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2015 by Robin Schneider <ypid at riseup.net>
+% Copyright (C) 2015-2017 by Robin Schneider <ypid at riseup.net>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -27,7 +27,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1998/12/01]
%<package>\ProvidesPackage{doclicense}
%<*package>
- [2016/04/24 v1.5.0 Support for putting documents under a license]
+ [2017/10/07 v1.6.0 Support for putting documents under a license]
%</package>
%
%<*driver>
@@ -122,6 +122,8 @@
% \changes{1.4.0}{2015/12/13}{Added \cmd{\doclicensePlainFullText} and \cmd{\doclicenseFullText} macros Thanks to \href{https://github.com/siefkenj}{siefkenj} for the help.}
% \changes{1.4.1}{2016/04/10}{Translation fixes for: fr, en-gb. Included missing CC-by-nc-nd icon (US dollar).}
% \changes{1.5.0}{2016/04/24}{Allow to change the way text is typeset by \cmd{\doclicenseThis}.}
+% \changes{1.6.0}{2017/10/07}{Added Russian and Italian translation. Added `imageposition` and `imagedistance` parameters.}
+%% ^^A \changes{1.7.0}{2017/XX/XX}{}
%
%% ^^A nag warned about the center environment and it really messes up spacing.
%
@@ -192,13 +194,13 @@
%
% \section{Package options}
%
-% The first parameter is \enquote{\PrintOptionF{type}}. \DescribePara{type}
-% This sets the license type. Like in this example, the type can be
+% Sets the license type. \DescribePara{type}
+% Like in the previous example, the type can be
% \enquote{CC} to cover all the \doclicenseLongType licenses.
% Please make sure that the type is all uppercase. See the \nameref{sec:supported-licenses} section for a complete list.
%
-% The \DescribePara{modifier} next parameter is \enquote{\PrintOptionF{modifier}} which allows to
-% select different subclasses of a license. In this
+% Allows to
+% select different subclasses of a license. In the
% example it is \enquote{by-sa}.
% Please make sure that the type is all lowercase. See the \nameref{sec:supported-licenses} section for a complete list.
%
@@ -217,13 +219,21 @@
% \item[English] Added by \href{https://github.com/ypid}{Robin Schneider}.
% \item[French] Added by \href{https://github.com/ericguirbal}{\'Eric Guirbal}.
% \item[German] Added by \href{https://github.com/ypid}{Robin Schneider}.
+% \item[Italian] Added by \href{https://github.com/rig8f}{Filippo Rigotto}.
+% \item[Russian] Added by \href{https://github.com/bergentroll}{Anton Karmanov}.
% \item[Spanish] Added by \href{https://github.com/elsudano}{Carlos}.
% \end{eqlist}
%
+% Image position for \cmd{\doclicenseThis}: right (default) or left.
+% \DescribePara{imageposition}
+%
% Default image width for the license image.
% \DescribePara{imagewidth}
%
-% This options was added to support variations in the license images.
+% Distance between text and image in \cmd{\doclicenseThis}.
+% \DescribePara{imagedistance}
+
+% Select different variations of license images.
% \DescribePara{imagemodifier}
% For example, Creative Commons provides sometimes more than one image for one version.
% See the \href{https://creativecommons.org/about/downloads}{donwload page}.
@@ -369,7 +379,7 @@
% |\doclicenseImage[imagewidth=2em]|
% \end{quote}
%
-% The images are bundled with the \PackageName package as vector graphics.
+% The images are bundled with the \PackageName{} package as vector graphics.
%
% \DescribeMacro{\doclicenseImageFileName}
% This macro expands to the file name of the image which the
@@ -461,7 +471,9 @@
\DeclareStringOption{version}
\DeclareStringOption{lang}
\DeclareStringOption{imagemodifier}
+\DeclareStringOption[right]{imageposition}
\DeclareStringOption[10em]{imagewidth}
+\DeclareStringOption[2em]{imagedistance}
\DeclareStringOption{hyphenation}
%% )))
@@ -532,7 +544,7 @@
%% )))
% \end{macrocode}
-% \subsection{Macro user macros}
+% \subsection{User macros}
% \begin{macrocode}
%% User macros (((
\newcommand{\doclicenseType}{\doclicense at type\xspace}
@@ -583,7 +595,21 @@
\newcommand{\doclicenseLicense}{\doclicenseThis} %% legacy support
\newcommand{\doclicenseThis}{%
- \setlength{\doclicense at hsize}{\textwidth-\doclicense at imagewidth-2em}%
+ \setlength{\doclicense at hsize}{\textwidth-\doclicense at imagewidth-\doclicense at imagedistance}%
+ \ifthenelse{\equal{\doclicense at imageposition}{left}}{%
+ \begin{center}
+ \begin{minipage}{\doclicense at imagewidth}
+ \doclicenseImage%
+ \end{minipage}
+ \hfill
+ \begin{minipage}{\doclicense at hsize}
+ \ifthenelse{\isempty{\doclicense at hyphenation}}{}{%
+ \@nameuse{\doclicense at hyphenation}%
+ }%
+ \doclicenseLongText%
+ \end{minipage}
+ \end{center}
+ }{%
% \ifthenelse{\isnamedefined{iflandscape}}{%
% \iflandscape{%
% \setlength{\doclicense at hsize}{\doclicense at hsize-10em}%
@@ -590,19 +616,20 @@
% }{}%
% }{}%
% {%
- \begin{center}
- \begin{minipage}{\doclicense at hsize}
- \ifthenelse{\isempty{\doclicense at hyphenation}}{}{%
- \@nameuse{\doclicense at hyphenation}%
- }%
- \doclicenseLongText%
- \end{minipage}
- \hfill
- \begin{minipage}{\doclicense at imagewidth}
- \doclicenseImage%
- \end{minipage}
- \end{center}
+ \begin{center}
+ \begin{minipage}{\doclicense at hsize}
+ \ifthenelse{\isempty{\doclicense at hyphenation}}{}{%
+ \@nameuse{\doclicense at hyphenation}%
+ }%
+ \doclicenseLongText%
+ \end{minipage}
+ \hfill
+ \begin{minipage}{\doclicense at imagewidth}
+ \doclicenseImage%
+ \end{minipage}
+ \end{center}
% }
+ }
}
%% )))
Added: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf 2017-10-07 22:11:56 UTC (rev 45495)
@@ -0,0 +1,27 @@
+\ProvidesFile{doclicense-italian.ldf}
+
+\@namedef{doclicense at lang@thisDoc}{Quest'opera è distribuita con Licenza}%
+\@namedef{doclicense at lang@word at license}{}%
+\ifthenelse{\equal{\doclicense at imagemodifier}{}}{%
+ \@namedef{doclicense at imagemodifier}{-eu}
+}{}
+
+\@namedef{doclicense at lang@lic at CC@code}{it}%
+%% Using: https://en.wikipedia.org/wiki/ISO_639-1
+
+\@namedef{doclicense at lang@lic at CC@zero at 1.0}{CC0 1.0 Universale}%
+\@namedef{doclicense at lang@lic at CC@pd at 1.0}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
+
+\@namedef{doclicense at lang@lic at CC@by at 3.0}{Attribuzione 3.0 Italia}%
+\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{Attribuzione -- Condividi allo stesso modo 3.0 Italia}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 3.0}{Attribuzione -- Non opere derivate 3.0 Italia}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 3.0}{Attribuzione -- Non commerciale 3.0 Italia}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 3.0}{Attribuzione -- Non commerciale -- Condividi allo stesso modo 3.0 Italia}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 3.0}{Attribuzione -- Non commerciale -- Non opere derivate 3.0 Italia}%
+
+\@namedef{doclicense at lang@lic at CC@by at 4.0}{Attribuzione 4.0 Internazionale}%
+\@namedef{doclicense at lang@lic at CC@by-sa at 4.0}{Attribuzione -- Condividi allo stesso modo 4.0 Internazionale}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 4.0}{Attribuzione -- Non opere derivate 4.0 Internazionale}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 4.0}{Attribuzione -- Non commerciale 4.0 Internazionale}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 4.0}{Attribuzione -- Non commerciale -- Condividi allo stesso modo 4.0 Internazionale}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 4.0}{Attribuzione -- Non commerciale -- Non opere derivate 4.0 Internazionale}%
Property changes on: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-italian.ldf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf 2017-10-07 22:11:56 UTC (rev 45495)
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-russian.ldf}
+
+\@namedef{doclicense at lang@thisDoc}{Это произведение доступно по лицензии}%
+\@namedef{doclicense at lang@word at license}{}%
+
+\@namedef{doclicense at lang@lic at CC@code}{ru}%
+%% 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}{Отказ от своих прав в пользу общества с сохранением лишь неотъемлемых авторских прав (основано на законодательстве США)}% Инструмент списан, следует использовать CC0.
+
+\@namedef{doclicense at lang@lic at CC@by at 3.0}{<<Attribution>> (<<Атрибуция>>) 3.0 Непортированная}%
+\@namedef{doclicense at lang@lic at CC@by-sa at 3.0}{<<Attribution-ShareAlike>> (<<Атрибуция — На тех же условиях>>) 3.0 Непортированная}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 3.0}{<<Attribution-NoDerivs>> (<<Атрибуция — Без производных произведений>>) 3.0 Непортированная}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 3.0}{<<Attribution-NonCommercial>> (<<Атрибуция — Некоммерческое использование>>) 3.0 Непортированная}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 3.0}{<<Attribution-NonCommercial-ShareAlike>> (<<Атрибуция — Некоммерческое использование — На тех же условиях>>) 3.0 Непортированная}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 3.0}{<<Attribution-NonCommercial-NoDerivs>> (<<Атрибуция — Некоммерческое использование — Без производных произведений>>) 3.0 Непортированная}%
+
+\@namedef{doclicense at lang@lic at CC@by at 4.0}{Attribution 4.0 International}%
+\@namedef{doclicense at lang@lic at CC@by-sa at 4.0}{<<Attribution-ShareAlike>> (<<Атрибуция — На тех же условиях>>) 4.0 Всемирная}%
+\@namedef{doclicense at lang@lic at CC@by-nd at 4.0}{<<Attribution-NoDerivatives>> (<<Атрибуция — Без производных произведений>>) 4.0 Всемирная}%
+\@namedef{doclicense at lang@lic at CC@by-nc at 4.0}{<<Attribution-NonCommercial>> (<<Атрибуция — Некоммерческое использование>>) 4.0 Всемирная}%
+\@namedef{doclicense at lang@lic at CC@by-nc-sa at 4.0}{<<Attribution-NonCommercial-ShareAlike>> (<<Атрибуция — Некоммерческое использование — На тех же условиях>>) 4.0 Всемирная}%
+\@namedef{doclicense at lang@lic at CC@by-nc-nd at 4.0}{<<Attribution-NonCommercial-NoDerivatives>> (<<Атрибуция — Некоммерческое использование — Без производных произведений>>) 4.0 Всемирная}%
Property changes on: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense-russian.ldf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty 2017-10-07 22:11:37 UTC (rev 45494)
+++ trunk/Master/texmf-dist/tex/latex/doclicense/doclicense.sty 2017-10-07 22:11:56 UTC (rev 45495)
@@ -1,8 +1,10 @@
%% See file 'doclicense.dtx' for copyright and license.
\NeedsTeXFormat{LaTeX2e}[1998/12/01]
\ProvidesPackage{doclicense}
- [2016/04/24 v1.5.0 Support for putting documents under a license]
+ [2017/10/07 v1.6.0 Support for putting documents under a license]
+%% ^^A \changes{1.7.0}{2017/XX/XX}{}
%% ^^A nag warned about the center environment and it really messes up spacing.
+
%% Parameters (((
\RequirePackage{kvoptions}
\DeclareStringOption[CC]{type}
@@ -10,7 +12,9 @@
\DeclareStringOption{version}
\DeclareStringOption{lang}
\DeclareStringOption{imagemodifier}
+\DeclareStringOption[right]{imageposition}
\DeclareStringOption[10em]{imagewidth}
+\DeclareStringOption[2em]{imagedistance}
\DeclareStringOption{hyphenation}
%% )))
@@ -117,7 +121,21 @@
\newcommand{\doclicenseLicense}{\doclicenseThis} %% legacy support
\newcommand{\doclicenseThis}{%
- \setlength{\doclicense at hsize}{\textwidth-\doclicense at imagewidth-2em}%
+ \setlength{\doclicense at hsize}{\textwidth-\doclicense at imagewidth-\doclicense at imagedistance}%
+ \ifthenelse{\equal{\doclicense at imageposition}{left}}{%
+ \begin{center}
+ \begin{minipage}{\doclicense at imagewidth}
+ \doclicenseImage%
+ \end{minipage}
+ \hfill
+ \begin{minipage}{\doclicense at hsize}
+ \ifthenelse{\isempty{\doclicense at hyphenation}}{}{%
+ \@nameuse{\doclicense at hyphenation}%
+ }%
+ \doclicenseLongText%
+ \end{minipage}
+ \end{center}
+ }{%
% \ifthenelse{\isnamedefined{iflandscape}}{%
% \iflandscape{%
% \setlength{\doclicense at hsize}{\doclicense at hsize-10em}%
@@ -124,19 +142,20 @@
% }{}%
% }{}%
% {%
- \begin{center}
- \begin{minipage}{\doclicense at hsize}
- \ifthenelse{\isempty{\doclicense at hyphenation}}{}{%
- \@nameuse{\doclicense at hyphenation}%
- }%
- \doclicenseLongText%
- \end{minipage}
- \hfill
- \begin{minipage}{\doclicense at imagewidth}
- \doclicenseImage%
- \end{minipage}
- \end{center}
+ \begin{center}
+ \begin{minipage}{\doclicense at hsize}
+ \ifthenelse{\isempty{\doclicense at hyphenation}}{}{%
+ \@nameuse{\doclicense at hyphenation}%
+ }%
+ \doclicenseLongText%
+ \end{minipage}
+ \hfill
+ \begin{minipage}{\doclicense at imagewidth}
+ \doclicenseImage%
+ \end{minipage}
+ \end{center}
% }
+ }
}
%% )))
More information about the tex-live-commits
mailing list