From dee0a84614e3bfa877b2803b5743a5a2fc15609e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 31 Mar 2015 21:52:48 +0000 Subject: doclicense (31mar15) git-svn-id: svn://tug.org/texlive/trunk@36691 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/doclicense/doclicense.dtx | 31 ++++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx index 3907c30bcb0..07e874a9de3 100644 --- a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx +++ b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx @@ -27,7 +27,7 @@ %\NeedsTeXFormat{LaTeX2e}[1998/12/01] %\ProvidesPackage{doclicense} %<*package> - [2015/02/13 v0.10 Set and print the license of a document] + [2015/03/30 v1.0 Support for putting documents under a license] % % %<*driver> @@ -43,11 +43,15 @@ %% ^^A explaining any parameter when they first come up in the documentation. \newcommand{\DescribePara}[1]{\marginpar{\raggedleft\strut\MacroFont\string#1}} \usepackage{doclicense} +\usepackage[ + hyphens, + obeyspaces, + spaces, +]{url} \usepackage{ babel, csquotes, xcolor, - url, hyperxmp, hypdoc, nameref, @@ -103,11 +107,12 @@ corresponds to \PackageName~\fileversion, dated \filedate.}} % Grave accent \` Left brace \{ Vertical bar \| % Right brace \} Tilde \~} % -% \changes{0.7}{2015/02/05}{Initial version} -% \changes{0.8}{2015/02/06}{Added support for CC-zero and CC-pd and small improvements} -% \changes{0.9}{2015/02/07}{Added list of supported licenses to docu and added option imagemodifier. +% \changes{0.07}{2015/02/05}{Initial version} +% \changes{0.08}{2015/02/06}{Added support for CC-zero and CC-pd and small improvements} +% \changes{0.09}{2015/02/07}{Added list of supported licenses to docu and added option imagemodifier. % Also renamed macro \cmd{\doclicenseLicense} to \cmd{\doclicenseThis}} % \changes{0.10}{2015/02/13}{Added support for hyperxmp} +% \changes{1.0}{2015/03/30}{Removed space before quotes (Example: \enquote{CC } $\rightarrow$ \enquote{CC})} % % \DoNotIndex{\RequirePackage, \DeclareOption, \ProcessOptions} % \DoNotIndex{\PackageWarning, \MessageBreak} @@ -302,6 +307,7 @@ corresponds to \PackageName~\fileversion, dated \filedate.}} % % \newpage % \section{Implementation} +% \subsection{Dependencies} % \iffalse %<*package> % \fi @@ -358,7 +364,7 @@ corresponds to \PackageName~\fileversion, dated \filedate.}} \newlength{\doclicense@hsize} \newcommand{\doclicense@longName}{% \@nameuse{doclicense@lang@lic@\doclicense@type @\doclicense@modifier% - @\doclicense@versionUsed} + @\doclicense@versionUsed}% } \newcommand{\doclicense@icon}{% \PackageError{doclicense}{Icon not defined} @@ -375,18 +381,19 @@ corresponds to \PackageName~\fileversion, dated \filedate.}} \newcommand{\doclicenseModifier}{\MakeUppercase{\doclicense@modifier}\xspace} \newcommand{\doclicenseVersion}{\doclicense@versionUsed\xspace} \newcommand{\doclicenseName}{% - \doclicense@type~\doclicense@modifier~\doclicense@versionUsed\xspace} + \doclicense@type~\doclicense@modifier~\doclicense@versionUsed\xspace% +} \newcommand{\doclicenseNameRef}{\href{\doclicenseURL}{\doclicenseName}\xspace} \newcommand{\doclicenseLongName}{\doclicenseLongType\space\doclicense@longName\xspace} \newcommand{\doclicenseLongNameRef}{\href{\doclicenseURL}{\doclicenseLongName}} \newcommand{\doclicenseText}{% \doclicense@lang@thisDoc\space - \href{\doclicenseURL}{\enquote{\doclicenseName}} \doclicense@lang@word@license.\xspace + \href{\doclicenseURL}{\enquote{\doclicenseName{}}} \doclicense@lang@word@license.\xspace% } \newcommand{\doclicenseLongText}{% \doclicense@lang@thisDoc\space \href{\doclicenseURL}{\doclicenseLongType\space\enquote{\doclicense@longName}} - \doclicense@lang@word@license.\xspace + \doclicense@lang@word@license.\xspace% } \newcommand{\doclicenseIcon}{\doclicense@icon\xspace} \newcommand{\doclicenseImage}[1][]{% @@ -400,8 +407,10 @@ corresponds to \PackageName~\fileversion, dated \filedate.}} \newcommand{\doclicenseLicense}{\doclicenseThis} %% legacy support \newcommand{\doclicenseThis}{ \setlength{\doclicense@hsize}{\textwidth-\doclicense@imagewidth-2em} - \ifthenelse{\lengthtest{\hsize > \vsize}}{%% landscape - \setlength{\doclicense@hsize}{\doclicense@hsize-10em} + \ifthenelse{\isnamedefined{iflandscape}}{ + \iflandscape{ + \setlength{\doclicense@hsize}{\doclicense@hsize-10em} + }{} }{} \begin{center} \begin{minipage}{\doclicense@hsize} -- cgit v1.2.3