From 7bb8dc95076fa4605b0899b5fe73378595632e29 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 27 Jun 2013 23:35:29 +0000 Subject: paralist (13jun13) git-svn-id: svn://tug.org/texlive/trunk@30992 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/paralist/paralist.pdf | Bin 242028 -> 208561 bytes .../texmf-dist/source/latex/paralist/paralist.drv | 3 +- .../texmf-dist/source/latex/paralist/paralist.dtx | 56 +++++++++++++++------ Master/texmf-dist/tex/latex/paralist/paralist.sty | 9 ++-- 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/Master/texmf-dist/doc/latex/paralist/paralist.pdf b/Master/texmf-dist/doc/latex/paralist/paralist.pdf index 2b039427d00..4ec83ad959c 100644 Binary files a/Master/texmf-dist/doc/latex/paralist/paralist.pdf and b/Master/texmf-dist/doc/latex/paralist/paralist.pdf differ diff --git a/Master/texmf-dist/source/latex/paralist/paralist.drv b/Master/texmf-dist/source/latex/paralist/paralist.drv index 360d8c60648..afe2f2f65b9 100644 --- a/Master/texmf-dist/source/latex/paralist/paralist.drv +++ b/Master/texmf-dist/source/latex/paralist/paralist.drv @@ -32,7 +32,7 @@ %% Right brace \} Tilde \~} %% \ProvidesFile{paralist.drv}% - [2002/03/18 v2.3b Extended list environments (BS)] + [2013/06/09 v2.4 Extended list environments] \documentclass[11pt]{ltxdoc} \usepackage[defblank,neverdecrease]{paralist} @@ -52,4 +52,3 @@ \begin{document} \DocInput{paralist.dtx} \end{document} - diff --git a/Master/texmf-dist/source/latex/paralist/paralist.dtx b/Master/texmf-dist/source/latex/paralist/paralist.dtx index bcaa740dd34..073e6f8e76c 100644 --- a/Master/texmf-dist/source/latex/paralist/paralist.dtx +++ b/Master/texmf-dist/source/latex/paralist/paralist.dtx @@ -1,8 +1,9 @@ % \iffalse % File paralist.dtx -% Copyright 1998-2002 Bernd Schandl +% Copyright 1998-2003 Bernd Schandl +% Modifications copyright 2013 Julian Gilbey % email schandl@gmx.net -% www http://schandl.gmxhome.de/paralist +% www http://sarovar.org/projects/paralist % % Documentation and documented source code for the paralist package. % @@ -14,7 +15,6 @@ % version 1 of the license, or (at your option) any later version. % % \fi -% \CheckSum{1046} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -39,7 +39,7 @@ %\ProvidesFile{paralist.drv}% % \fi % \ProvidesFile{paralist.dtx}% - [2002/03/18 v2.3b Extended list environments (BS)] + [2013/06/09 v2.4 Extended list environments] % \iffalse %<*driver> \documentclass[11pt]{ltxdoc} @@ -63,7 +63,7 @@ \end{document} % % \fi -% +% % \changes{v1.0 (1998/10/09)}{}{Initial version} % \changes{v1.1 (1998/10/18)}{}{Added some examples} % \changes{v1.2 (1999/01/10)}{1999/01/07}{Most of the package and the @@ -73,9 +73,13 @@ % \changes{v1.9 (2000/03/05)}{2000/03/05}{Email and WWW changed} % \changes{v2.2 (2001/09/30)}{2001/09/30}{WWW changed} % \changes{v2.2a (2001/10/02)}{2001/10/02}{Minor documentation changes} -% +% \changes{v2.3 (2002/03/10)}{2002/03/10}{Several changes in code} +% \changes{v2.3a (2002/03/10)}{2002/03/10}{Couple of changes} +% \changes{v2.3b (2002/03/18)}{2002/03/18}{Fix handling of flags} +% \changes{v2.4 (2013/06/09)}{2013/06/09}{Extra option for label width (JDG)} % % \GetFileInfo{paralist.dtx} +% \CheckSum{1053} % % \makeatletter % \renewenvironment{theglossary}{% @@ -219,6 +223,20 @@ % so in the examples above you would get i, a, 1 and I respectively if you % referenced the first item. % +% If the labels use roman (as in the first example above), an attempt +% is made to determine the widest necessary label, assuming the +% maximum item number is at most~7. If this is not the case, and the +% labels might be wider than this, one can use a second optional +% argument specifying the widest label number, for example:\\ +% \tab|\begin{enumerate}[(i)][8]|\\ +% which will produce the labels (i), (ii), \dots, (vii), (viii), (ix) +% and so on, with everything up to (xvi) fitting +% comfortably.\footnote{This feature was introduced in version 2.4 of +% this package, and it would be wise therefore, if using this +% feature in portable documents, to specify +% \texttt{\char`\\usepackage\char`\{paralist\char`\}[2013/06/09]} +% when loading the package.} +% % \DescribeMacro{\pointedenum} % \DescribeMacro{\pointlessenum} % There are also two package options and two corresponding macros to format @@ -692,6 +710,8 @@ % % \changes{v2.3 (2002/03/10)}{2002/03/07}{New flags to decide on label width % adjustment} +% \changes{v2.4 (2013/06/09)}{2013/06/09}{New flags to decide on wide +% label width} % First we need some flags to indicate whether the label was redefined by the % environment and whether the label should be adjusted. % \begin{macrocode} @@ -704,8 +724,11 @@ % \textsf{increaseonly}, \cs{leftmargin}$\,n$ may only be increased} % \changes{v2.1 (2001/09/20)}{2001/09/16}{New macro} % \changes{v2.3 (2002/03/10)}{2002/03/07}{Use new flags} -% For the enumerated environments, the counter is first set to 7 so that we -% get the width of `vii' if Roman numbering is in force. +% \changes{v2.4 (2013/06/09)}{2013/06/09}{Allow arbitrary widest label} +% For the enumerated environments, the counter is first set by default +% to 7 so that we get the width of `vii' if Roman numbering is in +% force. However, this 7 can be replaced by an arbitrary number as an +% option if this is not large enough. % \begin{macrocode} \def\@adjust@enum@labelwidth{% \if@plneveradjust\else @@ -714,7 +737,7 @@ \fi \fi \if@pldoadjust - \csname c@\@enumctr\endcsname7 + \setcounter{\@enumctr}{\@enum@widestlabel} \settowidth{\@tempdima}{% \csname label\@enumctr\endcsname\hspace{\labelsep}}% % \end{macrocode} @@ -954,10 +977,17 @@ counters.\MessageBreak The label is: \@gobble#2}% \fi % \end{macrocode} -% Define |\labelenum|$\,n$ and |\theenum|$\,n$. +% Define |\labelenum|$\,n$ and |\theenum|$\,n$. And here we define a +% macro |\@enumwidelabel@| so that if the document has |[|$n$|]| after +% the beginning of the enumerate environment, the label width will be +% determined by typesetting $n$ instead of the default 7. % \begin{macrocode} \expandafter\edef\csname label\@enumctr\endcsname{\the\pl@lab}% \expandafter\let\csname the\@enumctr\endcsname\pl@the + \@ifnextchar[{\@enumwidestlabel@{#1}}{\@enumwidestlabel@{#1}[7]}% +} +\def\@enumwidestlabel@#1[#2]{% + \def\@enum@widestlabel{#2} % \end{macrocode} % Finally call the macro that finishes the \cs{begin} part of the % calling environment. @@ -1523,9 +1553,3 @@ % \end{macrocode} % % \Finale - - - - - - diff --git a/Master/texmf-dist/tex/latex/paralist/paralist.sty b/Master/texmf-dist/tex/latex/paralist/paralist.sty index efaf694688f..46809e1a590 100644 --- a/Master/texmf-dist/tex/latex/paralist/paralist.sty +++ b/Master/texmf-dist/tex/latex/paralist/paralist.sty @@ -32,7 +32,7 @@ %% Right brace \} Tilde \~} %% \ProvidesPackage{paralist}% - [2002/03/18 v2.3b Extended list environments (BS)] + [2013/06/09 v2.4 Extended list environments] \NeedsTeXFormat{LaTeX2e} \newif\if@plnewitem\@plnewitemtrue \newif\if@plnewenum\@plnewenumtrue @@ -106,7 +106,7 @@ \fi \fi \if@pldoadjust - \csname c@\@enumctr\endcsname7 + \setcounter{\@enumctr}{\@enum@widestlabel} \settowidth{\@tempdima}{% \csname label\@enumctr\endcsname\hspace{\labelsep}}% \advance\@listdepth by 1\relax @@ -186,6 +186,10 @@ \fi \expandafter\edef\csname label\@enumctr\endcsname{\the\pl@lab}% \expandafter\let\csname the\@enumctr\endcsname\pl@the + \@ifnextchar[{\@enumwidestlabel@{#1}}{\@enumwidestlabel@{#1}[7]}% +} +\def\@enumwidestlabel@#1[#2]{% + \def\@enum@widestlabel{#2} #1} \def\@itemlabel@#1[#2]{% \@plmylabeltrue @@ -466,7 +470,6 @@ \PackageInfo{Paralist}{% Using the configuration file paralist.cfg}}{} \fi - \endinput %% %% End of file `paralist.sty'. -- cgit v1.2.3