enumitem (4feb19)

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

4 files changed, 34 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/enumitem/README.md b/Master/texmf-dist/doc/latex/enumitem/README.md
index 29d6c1eca3f..c04a89fc1c9 100644
--- a/Master/texmf-dist/doc/latex/enumitem/README.md
+++ b/Master/texmf-dist/doc/latex/enumitem/README.md
@@ -1,4 +1,4 @@
-## Enumitem 3.7
+## Enumitem 3.8
 
 This package provides most of the flexibility you may want to customize
 the three basic list environments (`enumerate`, `itemize` and
@@ -8,6 +8,9 @@ syntax.
 ### Latest changes
 
 ```
+3.8  2019-02-04
+   - Fix - calc stopped working if loaded after.
+   - Improved \DrawEnumitemLabel
 3.7  2019-01-14
    - Option series=override, to overcome some backwards
      incompatibilities.
@@ -33,4 +36,4 @@ Repository:  https://github.com/jbezos/enumitem
 ________
 Javier Bezos --- http://www.texnia.com
 
-2019/01/14
+2019/02/04
diff --git a/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf b/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf
index 0da16b234aa..a0816988182 100644
--- a/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf
+++ b/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf
diff --git a/Master/texmf-dist/doc/latex/enumitem/enumitem.tex b/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
index 889606770fd..4f96b6408d3 100644
--- a/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
+++ b/Master/texmf-dist/doc/latex/enumitem/enumitem.tex
@@ -56,7 +56,7 @@
 suggestions go to \href{http://www.texnia.com/enumitem.html}%
 {\texttt{http://www.texnia.com/enumitem.html}}.}}
 
-\date{Version 3.7\\2019/01/14}
+\date{Version 3.8\\2019/02/04}
 
 \IfFileExists{enumitem.sty}{\usepackage{enumitem}}{}
 
@@ -220,8 +220,8 @@ available in inline lists, where further keys are available (see
 \ref{s.inline}).
 
 \begin{warning}
-  If the value is completely enclosed in braces, they are removed. If
-  you want the braces, they must be duplicated. This is the default
+  If the value is completely enclosed in braces, they are stripped off.
+  If you want the braces, they must be duplicated. This is the default
   behavior of \textsf{keyval}, which \textsf{enumitem} just emulates.
 \end{warning}
 
@@ -435,8 +435,8 @@ takes a negative value.
 can visualize them by writing |\DrawEnumitemLabel| just before the
 first item (or in |first|), which draws 4 rules from top to bottom,
 |leftmargin| (thin), |labelindent| (thick if positive, thin if
-negative), |labelwidth| (thick) and |labelsep| (thick). If 0, a rule is
-not shown.
+negative), |labelwidth| (thick) and |labelsep| (thick if positive, thin
+if negative). If 0, a rule is not shown.
 \end{note}
 
 \begin{desc}
@@ -471,7 +471,10 @@ The five parameters are related in the following way:
 layouts for the label. You may regard it as a sort or ``rule'' with two
 tab stops: the start of the label and the start of the text (both with
 relation to the normal side margin). With only |<labelindent>|, the
-left margin (the ``start of text'') is computed with the |labelsep|.
+left margin (the ``start of text'') is computed with the |labelsep|. It
+internally resorts to |widest|, so the restrictions of the letter with
+relation to |description| also applies here: you might need change the
+computed parameter (eg, |itemindent=*| with |align=left|).
 
 \begin{example}
   Typical settings would be:
@@ -830,14 +833,23 @@ is the same as
 \begin{itemize}
 <code>
 \end{verbatim}
-With it you may insert, for example, an |\item|.
+
+\begin{example}
+  With |first| you can define your own environments for displayed
+  material. A trivial example is:
+\begin{verbatim}
+\newlist{letter}{itemize}{1}
+\setlist[letter]{first=\item[]\itshape, rightmargin=\leftmargin}
+\end{verbatim}
+Here there is no need for a |label|, because it is not used.
+\end{example}
 
 \begin{desc}
 |\EnumitemId|
 \end{desc}
 
-To help in some tasks, a unique numeric identifier is assigned to each
-list, returned by |\EnumitemId|.
+\New{3.7} To help in some tasks, a unique numeric identifier is
+assigned to each list, returned by |\EnumitemId|.
 
 \begin{example}
   Here is an example of how to combine a |\label| with |\EnumitemId|,
@@ -877,16 +889,6 @@ Then just use the key |widestlabel|.
   is not expandable.
 \end{example}
 
-\begin{example}
-  With |first| you can define your own environments for displayed
-  material. A trivial example is:
-\begin{verbatim}
-\newlist{letter}{itemize}{1}
-\setlist[letter]{first=\item[]\itshape, rightmargin=\leftmargin}
-\end{verbatim}
-Here there is no need for a |label|, because it is not used.
-\end{example}
-
 \subsection{Description styles}
 
 A key available in |description|.
diff --git a/Master/texmf-dist/tex/latex/enumitem/enumitem.sty b/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
index 9ff077e45ff..83d55cbd569 100644
--- a/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
+++ b/Master/texmf-dist/tex/latex/enumitem/enumitem.sty
@@ -10,7 +10,7 @@
 % ~~~~~~~
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{enumitem}[2019/01/14 v3.7 Customized lists]
+\ProvidesPackage{enumitem}[2019/02/04 v3.8 Customized lists]
 
 % Notes
 % ~~~~~
@@ -1774,7 +1774,7 @@
      {\@nameuse{enit@description*}\enitdp@description{description}\@M{#1}}
      {\@nameuse{enit@enddescription*}}}
 
-\let\enit@setlength\setlength
+\def\enit@setlength{\setlength}
 \DeclareOption{sizes}
   {\def\enit@setlength#1#2{%
      \enit@try@size@range{#2}%  Returns \enit@c
@@ -1838,7 +1838,6 @@
           \hskip\itemindent
           \ifdim\labelindent<\z@
             \hskip-\leftmargin
-            \hskip\labelindent
             \vrule width -\labelindent height 6pt depth -5pt
             \hskip\labelindent
           \else
@@ -1848,7 +1847,12 @@
             \vrule width \labelindent height 6pt depth -4pt
           \fi
           \vrule width \labelwidth height 4pt depth -2pt
-          \vrule width \labelsep height 2pt}%
+          \ifdim\labelsep<\z@
+            \hskip\labelsep
+            \vrule width -\labelsep height 1pt
+          \else
+            \vrule width \labelsep height 2pt
+          \fi}%
   \else
     \enit@error
        {\string\DrawEnumitemLabel\space must be used in vertical mode}%