doclicense (8apr19)

git-svn-id: svn://tug.org/texlive/trunk@50871 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 48 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
index 83439ed76f3..b10b5a82c7d 100644
--- a/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
+++ b/Master/texmf-dist/source/latex/doclicense/doclicense.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2015-2018 by Robin Schneider <ypid@riseup.net>
+% Copyright (C) 2015-2019 by Robin Schneider <ypid@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>
-    [2018/06/10 v1.8.0 Support for putting documents under a license]
+    [2019/04/07 v1.9.0 Support for putting documents under a license]
 %</package>
 %
 %<*driver>
@@ -126,6 +126,7 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
 % \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.}
 %
 %% ^^A nag warned about the center environment and it really messes up spacing.
 %
@@ -218,13 +219,20 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
 % Supported languages:
 % ^^A Sorted alphabetically.
 % \begin{eqlist}
-%   \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[Polish]  Added by \href{https://github.com/jsbien}{jsbien}.
-%   \item[Russian] Added by \href{https://github.com/bergentroll}{Anton Karmanov}.
-%   \item[Spanish] Added by \href{https://github.com/elsudano}{Carlos}. Updated by \href{https://github.com/IgnacioFDM}{IgnacioFDM}.
+%   \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}.
+%   \item[French]     Added by \href{https://github.com/ericguirbal}{\'Eric Guirbal}.
+%   \item[Galician]   Submitted by Email.
+%   \item[German]     Added by \href{https://github.com/ypid}{Robin Schneider}.
+%   \item[Italian]    Added by \href{https://github.com/rig8f}{Filippo Rigotto}.
+%   \item[Polish]     Added by \href{https://github.com/jsbien}{jsbien}.
+%   \item[Portuguese] Added by \href{https://github.com/alexandre1985}{Daniel Alexandre Cerqueira Santos}.
+%   \item[Russian]    Added by \href{https://github.com/bergentroll}{Anton Karmanov}.
+%   \item[Spanish]    Added by \href{https://github.com/elsudano}{Carlos}. Updated by \href{https://github.com/IgnacioFDM}{IgnacioFDM}.
+%
+%
+%
 % \end{eqlist}
 %
 % Image position for \cmd{\doclicenseThis}: right (default) or left.
@@ -495,6 +503,16 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
 \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@enumerate}{enumerate}{4}
+\setlist[doclicense@enumerate,1]{label = (\alph*)}
+\setlist[doclicense@enumerate,2]{label = (\arabic*)}
+\setlist[doclicense@enumerate,3]{label = (\Alph*)}
+\setlist[doclicense@enumerate,4]{label = (\roman*)}
+
 \ifthenelse{
   \equal{\doclicense@hyphenation}{}
 }{}{%
@@ -506,7 +524,27 @@ corresponds to \PackageName\nobreakspace\fileversion, dated \filedate.}}
   }
 }
 \AtEndPreamble{%
-  \@ifpackageloaded{csquotes}{}{\RequirePackage{csquotes}}
+  \@ifpackageloaded{csquotes}{
+    %% csquotes has already been loaded so we are fine.
+  }{
+    \ifcsdef{enquote}{
+      %% \enquote is defined but not by csquotes.
+      \@ifpackageloaded{biblatex}{
+        \PackageError{doclicense}{The enquote macro is defined by biblatex}
+          {This package assumes that the enquote macro is defined by the
+            csquotes package. Please load csquotes before you load biblatex so
+            that biblatex does not define enquote instead.}%
+      }{
+        \PackageError{doclicense}{The enquote macro is defined by unknown package}
+          {This package assumes that the enquote macro is defined by the
+            csquotes package. Please check why enquote is defined without
+            csquotes being loaded. Maybe try loading csquotes early so that it
+            can define the enquote macro instead.}%
+      }
+    }{
+      \RequirePackage{csquotes}
+    }
+  }
   \@ifpackageloaded{ccicons}{}{\RequirePackage{ccicons}}
     %% For \doclicenseIcon
   \@ifpackageloaded{graphicx}{}{\RequirePackage{graphicx}}