summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-08-14 22:00:28 +0000
committerKarl Berry <karl@freefriends.org>2016-08-14 22:00:28 +0000
commit2ee47639dde156bb5ac897bf13c7fd80c9db507f (patch)
tree8a5f3dc68c49bbe8752cc7dc790b0a4193e61c7e /Master
parent64b91a4549ca4899a3e3d0fdf5af1c21fc2e7285 (diff)
paralist
git-svn-id: svn://tug.org/texlive/trunk@41852 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/paralist/README2
-rw-r--r--Master/texmf-dist/doc/latex/paralist/paralist.pdfbin221807 -> 222058 bytes
-rw-r--r--Master/texmf-dist/source/latex/paralist/paralist.drv4
-rw-r--r--Master/texmf-dist/source/latex/paralist/paralist.dtx11
-rw-r--r--Master/texmf-dist/source/latex/paralist/paralist.ins4
-rw-r--r--Master/texmf-dist/tex/latex/paralist/paralist.sty6
6 files changed, 17 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/paralist/README b/Master/texmf-dist/doc/latex/paralist/README
index ae432265838..8ca75c77c11 100644
--- a/Master/texmf-dist/doc/latex/paralist/README
+++ b/Master/texmf-dist/doc/latex/paralist/README
@@ -60,7 +60,7 @@ commands:
COPYING AND MODIFICATION
-Copyright 1998-2015 Bernd Schandl
+Copyright 1998-2016 Bernd Schandl
Copyright 2013 Julian Gilbey (modifications in v2.4)
The paralist package consists of the following files:
diff --git a/Master/texmf-dist/doc/latex/paralist/paralist.pdf b/Master/texmf-dist/doc/latex/paralist/paralist.pdf
index ff787e6b8b6..25ff6880c99 100644
--- a/Master/texmf-dist/doc/latex/paralist/paralist.pdf
+++ b/Master/texmf-dist/doc/latex/paralist/paralist.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/paralist/paralist.drv b/Master/texmf-dist/source/latex/paralist/paralist.drv
index 27e3e27a694..219f51a1941 100644
--- a/Master/texmf-dist/source/latex/paralist/paralist.drv
+++ b/Master/texmf-dist/source/latex/paralist/paralist.drv
@@ -6,7 +6,7 @@
%%
%% paralist.dtx (with options: `driver')
%%
-%% Copyright 1998-2015 Bernd Schandl
+%% Copyright 1998-2016 Bernd Schandl
%% Copyright 2013 Julian Gilbey (modifications in v2.4)
%% email schandl@gmx.com
%%
@@ -32,7 +32,7 @@
%% Right brace \} Tilde \~}
%%
\ProvidesFile{paralist.drv}%
- [2015/12/30 v2.5 Extended list environments]
+ [2016/08/07 v2.6 Extended list environments]
\documentclass[11pt]{ltxdoc}
\usepackage[defblank,neverdecrease]{paralist}
diff --git a/Master/texmf-dist/source/latex/paralist/paralist.dtx b/Master/texmf-dist/source/latex/paralist/paralist.dtx
index 97c62d6535a..3dd90be5011 100644
--- a/Master/texmf-dist/source/latex/paralist/paralist.dtx
+++ b/Master/texmf-dist/source/latex/paralist/paralist.dtx
@@ -1,6 +1,6 @@
% \iffalse
% File paralist.dtx
-% Copyright 1998-2015 Bernd Schandl
+% Copyright 1998-2016 Bernd Schandl
% Copyright 2013 Julian Gilbey (modifications in v2.4)
% email schandl@gmx.com
%
@@ -38,7 +38,7 @@
%<driver>\ProvidesFile{paralist.drv}%
% \fi
% \ProvidesFile{paralist.dtx}%
- [2015/12/30 v2.5 Extended list environments]
+ [2016/08/07 v2.6 Extended list environments]
% \iffalse
%<*driver>
\documentclass[11pt]{ltxdoc}
@@ -77,6 +77,7 @@
% \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)}
% \changes{v2.5 (2015/12/30)}{2015/12/30}{Fix excess space introduced in v2.4}
+% \changes{v2.6 (2016/08/07)}{2016/08/07}{Fix of inparaitem and inparadesc}
%
% \GetFileInfo{paralist.dtx}
% \CheckSum{1053}
@@ -405,7 +406,7 @@
% The |asparadesc| environment is again very similar to |asparaenum|. It just
% uses the optional arument of \cs{item} as the ``intro'' for the paragraph.
%
-% \DescribeEnv{inparaitem}
+% \DescribeEnv{inparadesc}
% Again similar to |inparaenum|, I added an environment |inparadesc|. Probably
% nobody would use it but I added it because of symmetry.
%
@@ -1198,10 +1199,12 @@
% \changes{v1.1 (1998/10/18)}{}{Make space after symbol non-breaking}
% \changes{v1.2 (1999/01/10)}{1999/01/07}{Rewritten}
% \changes{v2.1 (2001/09/20)}{2001/09/16}{Define \cs{makelabel}}
+% \changes{v2.6 (2016/08/07)}{2016/08/07}{Insert \cs{@nmbrlistfalse} to avoid increasing the enum counter}
% Again the same as |inparaenum| without the counter stuff but with an
% optional argument.
% \begin{macrocode}
\def\inparaitem{%
+ \@nmbrlistfalse
\ifnum\@itemdepth>\thr@@
\@toodeep
\else
@@ -1312,9 +1315,11 @@
% \end{environment}
% \begin{environment}{inparadesc}
% \changes{v2.1 (2001/09/20)}{2001/09/16}{New environment}
+% \changes{v2.6 (2016/08/07)}{2016/08/07}{Insert \cs{@nmbrlistfalse} to avoid increasing the enum counter}
% Again a bit easier than |inparaenum| since the label handling is easier.
% \begin{macrocode}
\def\inparadesc{%
+ \@nmbrlistfalse
\let\@itemlabel\@empty
\let\@item\pl@item
\let\makelabel\paradescriptionlabel
diff --git a/Master/texmf-dist/source/latex/paralist/paralist.ins b/Master/texmf-dist/source/latex/paralist/paralist.ins
index 5292a2b0099..f377ee2cb22 100644
--- a/Master/texmf-dist/source/latex/paralist/paralist.ins
+++ b/Master/texmf-dist/source/latex/paralist/paralist.ins
@@ -1,5 +1,5 @@
% File paralist.ins
-% Copyright 1998-2015 Bernd Schandl
+% Copyright 1998-2016 Bernd Schandl
% Copyright 2013 Julian Gilbey (modifications in v2.4)
% email schandl@gmx.com
%
@@ -18,7 +18,7 @@
% define preamble
\preamble
-Copyright 1998-2015 Bernd Schandl
+Copyright 1998-2016 Bernd Schandl
Copyright 2013 Julian Gilbey (modifications in v2.4)
email schandl@gmx.com
diff --git a/Master/texmf-dist/tex/latex/paralist/paralist.sty b/Master/texmf-dist/tex/latex/paralist/paralist.sty
index 44c21240816..87fcff56a24 100644
--- a/Master/texmf-dist/tex/latex/paralist/paralist.sty
+++ b/Master/texmf-dist/tex/latex/paralist/paralist.sty
@@ -6,7 +6,7 @@
%%
%% paralist.dtx (with options: `package')
%%
-%% Copyright 1998-2015 Bernd Schandl
+%% Copyright 1998-2016 Bernd Schandl
%% Copyright 2013 Julian Gilbey (modifications in v2.4)
%% email schandl@gmx.com
%%
@@ -32,7 +32,7 @@
%% Right brace \} Tilde \~}
%%
\ProvidesPackage{paralist}%
- [2015/12/30 v2.5 Extended list environments]
+ [2016/08/07 v2.6 Extended list environments]
\NeedsTeXFormat{LaTeX2e}
\newif\if@plnewitem\@plnewitemtrue
\newif\if@plnewenum\@plnewenumtrue
@@ -294,6 +294,7 @@
\def\makelabel##1{##1}}}
\let\endasparaitem\endlist
\def\inparaitem{%
+ \@nmbrlistfalse
\ifnum\@itemdepth>\thr@@
\@toodeep
\else
@@ -358,6 +359,7 @@
\let\makelabel\paradescriptionlabel}}
\let\endasparadesc\endlist
\def\inparadesc{%
+ \@nmbrlistfalse
\let\@itemlabel\@empty
\let\@item\pl@item
\let\makelabel\paradescriptionlabel