From aa7047f2124bed0dd8bf7be61b5d99517f233a1e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 22 Jun 2019 21:22:49 +0000 Subject: enumitem (22jun19) git-svn-id: svn://tug.org/texlive/trunk@51423 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/enumitem/README.md | 6 +- Master/texmf-dist/doc/latex/enumitem/enumitem.pdf | Bin 141429 -> 145488 bytes Master/texmf-dist/doc/latex/enumitem/enumitem.tex | 31 ++++++--- Master/texmf-dist/tex/latex/enumitem/enumitem.sty | 73 +++++++++++++--------- 4 files changed, 67 insertions(+), 43 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/enumitem/README.md b/Master/texmf-dist/doc/latex/enumitem/README.md index c04a89fc1c9..8364f9ec0ed 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.8 +## Enumitem 3.9 This package provides most of the flexibility you may want to customize the three basic list environments (`enumerate`, `itemize` and @@ -8,6 +8,8 @@ syntax. ### Latest changes ``` +3.9 2019-06-20 + - \DrawEnumitemLabel rewritten 3.8 2019-02-04 - Fix - calc stopped working if loaded after. - Improved \DrawEnumitemLabel @@ -36,4 +38,4 @@ Repository: https://github.com/jbezos/enumitem ________ Javier Bezos --- http://www.texnia.com -2019/02/04 +2019/06/20 diff --git a/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf b/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf index a0816988182..fcbca83291b 100644 Binary files a/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf and b/Master/texmf-dist/doc/latex/enumitem/enumitem.pdf differ diff --git a/Master/texmf-dist/doc/latex/enumitem/enumitem.tex b/Master/texmf-dist/doc/latex/enumitem/enumitem.tex index 4f96b6408d3..9484acd5fa7 100644 --- a/Master/texmf-dist/doc/latex/enumitem/enumitem.tex +++ b/Master/texmf-dist/doc/latex/enumitem/enumitem.tex @@ -56,9 +56,10 @@ suggestions go to \href{http://www.texnia.com/enumitem.html}% {\texttt{http://www.texnia.com/enumitem.html}}.}} -\date{Version 3.8\\2019/02/04} +\date{Version 3.9\\2019/06/20} \IfFileExists{enumitem.sty}{\usepackage{enumitem}}{} +\IfFileExists{layouts.sty}{\usepackage{layouts}}{} \addtolength{\topmargin}{-3pc} \addtolength{\textwidth}{6pc} @@ -83,8 +84,8 @@ suggestions go to \href{http://www.texnia.com/enumitem.html}% with \New{X.X}\hspace{-.5em}. The most recent features could be still unstable. Please, report any issues you find on \texttt{https://github.com/jbezos/enumitem/issues}, which is better - than just complaining on an e-mail list or a web forum. Feel free to - fork it and make pull requests. + than just complaining on an e-mail list or a web forum. Forking + and pull requests are welcome. \end{note} \begin{warning} @@ -161,8 +162,16 @@ Horizontal spacing: \end{example} \begin{note} - A way to see how these parameters work is with the |layout| package + A way to see how these parameters work is with the |layouts| package (the manual is named |layman.pdf|). + \ifx\listdiagram\notundefined\else + See figure \ref{f.drawlist}. + \begin{figure} + \centering + \listdiagram + \caption{List parameters}\label{f.drawlist} + \end{figure} + \fi \end{note} \section{Quick reference} @@ -434,9 +443,9 @@ takes a negative value. \New{3.6} If you find these parameters baffling, you are not alone. You 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 positive, thin -if negative). If 0, a rule is not shown. +|labelindent|, |labelwidth|, |labelsep|, |itemindent| (thin if +positive, thick if negative); the |leftmargin| is marked with two +vertical rules. \end{note} \begin{desc} @@ -516,7 +525,7 @@ labelindent=! \begin{note} With |align=right| (the default), |labelindent=!| and |labelwidth=!| - behave similarly in practice. + behave similarly in practice. \end{note} \begin{desc} @@ -558,7 +567,9 @@ always the same within a list, of course). \end{note} \begin{note} - |labelwidth=*| and |labelwidth=!| are synonymous. + |labelwidth=*| and |labelwidth=!| are synonymous. Use them with care, + because they may take negative values, which does not make sense (a + warning is shown). \end{note} \begin{desc} @@ -1594,7 +1605,7 @@ The rule shows |labelindent|. \noindent\showsep\hskip\parindent En un lugar de la Mancha, de cuyo nombre no quiero acordarme, no ha mucho tiempo que viv\'{\i}a un hidalgo de los de -\begin{enumerate}[leftmargin=*] +\begin{enumerate}[leftmargin=*] \item lanza en astillero, \item adarna antigua, \item roc\'{\i}n flaco, y diff --git a/Master/texmf-dist/tex/latex/enumitem/enumitem.sty b/Master/texmf-dist/tex/latex/enumitem/enumitem.sty index 83d55cbd569..1cb7888572c 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/02/04 v3.8 Customized lists] +\ProvidesPackage{enumitem}[2019/06/20 v3.9 Customized lists] % Notes % ~~~~~ @@ -881,6 +881,13 @@ \enit@calcwidth \advance\itemindent-\dimen@ \fi} + +\def\enit@negwidth{% + \ifdim\labelwidth<\z@ + \PackageWarning{enumitem}% + {Negative labelwidth. This does not make much\MessageBreak + sense,}% + \fi} % "Normalizing" labels % ==================== @@ -1369,7 +1376,8 @@ \enit@normlabel\@itemlabel\@itemlabel \enit@ref \enit@calcleft - \enit@before}% + \enit@before + \enit@negwidth}% \enit@keyfirst \fi} @@ -1405,7 +1413,8 @@ \def\makelabel##1{\enit@align{\enit@format{##1}}}% \enit@preset{#2}{#1}{#4}% \enit@calcleft - \enit@before}% + \enit@before + \enit@negwidth}% \enit@keyfirst \fi} @@ -1452,7 +1461,8 @@ \enit@svlabel{\enit@format{##1}}% \aftergroup\enit@postlabel \fi}% - \enit@before}% + \enit@before + \enit@negwidth}% \enit@keyfirst \fi} @@ -1830,34 +1840,35 @@ % | TOOLS | % +=============================+ +\def\enit@drawrule#1#2#3#4{% + \rlap{% + \ifdim#1>0pt\relax + \vrule width #1 height #2 depth -#3\relax + \else\ifdim#1=0pt\relax + % + \else + \hskip#1% + \vrule width -#1 height #2 depth -#4\relax + \fi\fi}} + \def\DrawEnumitemLabel{% - \ifvmode - \hbox{\hskip\@totalleftmargin - \hskip-\leftmargin - \vrule width \leftmargin height 8pt depth -7pt - \hskip\itemindent - \ifdim\labelindent<\z@ - \hskip-\leftmargin - \vrule width -\labelindent height 6pt depth -5pt - \hskip\labelindent - \else - \hskip-\labelsep - \hskip-\labelwidth - \hskip-\labelindent - \vrule width \labelindent height 6pt depth -4pt - \fi - \vrule width \labelwidth height 4pt depth -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}% - {Very likely, just inserting a blank line before will fix it}% - \fi} + \begingroup + \item[]% + \hskip-\labelsep + \enit@drawrule\labelsep{4pt}{3pt}{2.3pt}% + \hskip-\labelwidth + \enit@drawrule\labelwidth{6pt}{5pt}{4.3pt}% + \hskip\labelwidth + \hskip\labelsep + % + \hskip-\itemindent + \enit@drawrule\itemindent{2pt}{1pt}{.3pt}% + \rlap{\vrule height 9pt depth .5pt}% + \hskip-\leftmargin + \rlap{\vrule height 9pt depth .5pt}% + \enit@drawrule\labelindent{8pt}{7pt}{6.5pt}% + % \message{\the\labelindent/\the\labelwidth/\the\labelsep/\the\itemindent}% + \endgroup} % TODO - option 'verbose' -- cgit v1.2.3