summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-08-05 20:13:51 +0000
committerKarl Berry <karl@freefriends.org>2015-08-05 20:13:51 +0000
commita4b78f0fc9446d2cfae36e0d82ef6a80d3e5f039 (patch)
tree9d463d2c7b4a5ad120a33882a9a8f50825948666 /Master/texmf-dist/tex/latex
parent75407eb95e7f8d1a86497cb63ac3c30e8f48904f (diff)
doclicense (5aug15)
git-svn-id: svn://tug.org/texlive/trunk@38049 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-acadian.ldf3
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-canadien.ldf3
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf28
-rw-r--r--Master/texmf-dist/tex/latex/doclicense/doclicense.sty21
4 files changed, 47 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-acadian.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-acadian.ldf
new file mode 100644
index 00000000000..7301dfa4ac4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-acadian.ldf
@@ -0,0 +1,3 @@
+\ProvidesFile{doclicense-acadian.ldf}
+
+\input{doclicense-french.ldf}
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-canadien.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-canadien.ldf
new file mode 100644
index 00000000000..fc5484c8d8e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-canadien.ldf
@@ -0,0 +1,3 @@
+\ProvidesFile{doclicense-canadien.ldf}
+
+\input{doclicense-french.ldf}
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf b/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf
new file mode 100644
index 00000000000..03ee1f2db09
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/doclicense/doclicense-french.ldf
@@ -0,0 +1,28 @@
+\ProvidesFile{doclicense-french.ldf}
+
+\ifthenelse{\equal{\doclicense@lang}{french} \AND \equal{\doclicense@imagemodifier}{}}{%
+ \@namedef{doclicense@imagemodifier}{-eu}
+}{}
+
+\@namedef{doclicense@lang@thisDoc}{Ce document est mis \`a disposition selon les termes de la licence}%
+\@namedef{doclicense@lang@word@license}{}%
+
+\@namedef{doclicense@lang@lic@CC@code}{fr}%
+%% 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@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}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Attribution - Pas de modification 3.0 non transpos\'e}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Attribution - Pas d'utilisation commerciale 3.0 non transpos\'e}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Attribution - Pas d'utilisation commerciale - Partage dans les m\^emes conditions 3.0 non transpos\'e}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Attribution - Pas d'utilisation commerciale - Pas de modification 3.0 non transpos\'e}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{Attribution 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Attribution - Partage dans les m\^emes conditions 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{Attribution - Pas de modification 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{Attribution - Pas d'utilisation commerciale 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{Attribution - Pas d'utilisation commerciale - Partage dans les m\^emes conditions 4.0 International}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{Attribution - Pas d'utilisation commerciale 4.0 International}%
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
index 05c9f05edc1..2615aae406d 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}
- [2015/05/16 v1.2 Support for putting documents under a license]
+ [2015/08/04 v1.3 Support for putting documents under a license]
%% Dependencies (((
\RequirePackage{kvoptions}
@@ -73,6 +73,7 @@
\doclicense@lang@word@license.\xspace%
}
\newcommand{\doclicenseIcon}{\doclicense@icon\xspace}
+\newcommand{\doclicenseTypeIcon}{\doclicenseType}
\newcommand{\doclicenseImageFileName}{doclicense-\doclicense@type-\doclicense@modifier\doclicense@imagemodifier}
\newcommand{\doclicenseImage}[1][]{%
\setkeys{doclicense}{#1}
@@ -84,13 +85,15 @@
}
\newcommand{\doclicenseLicense}{\doclicenseThis} %% legacy support
-\newcommand{\doclicenseThis}{
- \setlength{\doclicense@hsize}{\textwidth-\doclicense@imagewidth-2em}
- \ifthenelse{\isnamedefined{iflandscape}}{
- \iflandscape{
- \setlength{\doclicense@hsize}{\doclicense@hsize-10em}
- }{}
- }{}
+\newcommand{\doclicenseThis}{%
+ \setlength{\doclicense@hsize}{\textwidth-\doclicense@imagewidth-2em}%
+ \ifthenelse{\isnamedefined{iflandscape}}{%
+ \iflandscape{%
+ % \setlength{\doclicense@hsize}{\doclicense@hsize-10em}%
+ }{}%
+ }{}%
+ % {%
+ % \centering%
\begin{center}
\begin{minipage}{\doclicense@hsize}
\doclicenseLongText%
@@ -100,6 +103,7 @@
\doclicenseImage%
\end{minipage}
\end{center}
+ % }
}
%% )))
@@ -136,6 +140,7 @@
%% CC (((
\ifthenelse{\equal{\doclicense@type}{CC}}{%
\renewcommand{\doclicenseLongType}{Creative Commons\xspace}
+ \renewcommand{\doclicenseTypeIcon}{\ccLogo\xspace}
\doclicense@setVersion[3.0]