3 files changed, 30 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf b/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
index dd96a54c9cb..040862a11fb 100644
--- a/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
+++ b/Master/texmf-dist/doc/latex/doclicense/doclicense.pdf
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 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1998/12/01]
 %<package>\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]
 %</package>
 %
 %<*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}
diff --git a/Master/texmf-dist/tex/latex/doclicense/doclicense.sty b/Master/texmf-dist/tex/latex/doclicense/doclicense.sty
index e1efe595bd8..69f8a1b0577 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/02/13 v0.10 Set and print the license of a document]
+    [2015/03/30 v1.0 Support for putting documents under a license]
 
 %% Dependencies {{{
 \RequirePackage{kvoptions}
@@ -42,7 +42,7 @@
 \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}
@@ -56,18 +56,19 @@
 \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][]{%
@@ -81,8 +82,10 @@
 \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}