parskip (19may20)

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

6 files changed, 193 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/parskip/MANIFEST.md b/Master/texmf-dist/doc/latex/parskip/MANIFEST.md
new file mode 100644
index 00000000000..ec8a0eebe0b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/parskip/MANIFEST.md
@@ -0,0 +1,127 @@
+# Manifest for parskip
+
+This file is a listing of all files considered to be part of this package.
+It is automatically generated with `texlua build.lua manifest`.
+
+
+## Repository manifest
+
+The following groups list the files included in the development repository of the package.
+Files listed with a ‘†’ marker are included in the TDS but not CTAN files, and files listed
+with ‘‡’ are included in both.
+
+### Source files
+
+These are source files for a number of purposes, including the `unpack` process which
+generates the installation files of the package. Additional files included here will also
+be installed for processing such as testing.
+
+* parskip.dtx ‡
+* parskip.ins ‡
+* parskip-2001-04-09.sty ‡
+
+### Typeset documentation source files
+
+These files are typeset using LaTeX to produce the PDF documentation for the package.
+
+* parskip-code.tex ‡
+* parskip.tex ‡
+
+### Text files
+
+Plain text files included as documentation or metadata.
+
+* MANIFEST.md ‡
+* README.md ‡
+* changes.txt ‡
+
+### Derived files
+
+The files created by ‘unpacking’ the package sources. This typically includes
+`.sty` and `.cls` files created from DocStrip `.dtx` files.
+
+* parskip.sty †
+
+### Typeset documents
+
+The output files (PDF, essentially) from typesetting the various source, demo,
+etc., package files.
+
+* parskip-code.pdf ‡
+* parskip.pdf ‡
+
+### Test files
+
+These files form the test suite for the package. `.lvt` or `.lte` files are the individual
+unit tests, and `.tlg` are the stored output for ensuring changes to the package produce
+the same output. These output files are sometimes shared and sometime specific for
+different engines (pdfTeX, XeTeX, LuaTeX, etc.).
+
+* github-0012.lvt 
+* parskip-000.lvt 
+* parskip-001.lvt 
+* parskip-002.lvt 
+* parskip-003.lvt 
+* parskip-004.lvt 
+* parskip-005.lvt 
+* parskip-006.lvt 
+* sx-450551.lvt 
+* github-0012.tlg 
+* parskip-000.tlg 
+* parskip-001.tlg 
+* parskip-002.tlg 
+* parskip-003.tlg 
+* parskip-004.tlg 
+* parskip-005.tlg 
+* parskip-006.tlg 
+* sx-450551.tlg 
+
+
+## TDS manifest
+
+The following groups list the files included in the TeX Directory Structure used to install
+the package into a TeX distribution.
+
+### Source files (TDS)
+
+All files included in the `parskip/source` directory.
+
+* parskip.dtx 
+* parskip.ins 
+
+### TeX files (TDS)
+
+All files included in the `parskip/tex` directory.
+
+* parskip-2001-04-09.sty 
+* parskip.sty 
+
+### Doc files (TDS)
+
+All files included in the `parskip/doc` directory.
+
+* MANIFEST.md 
+* README.md 
+* changes.txt 
+* parskip-code.pdf 
+* parskip-code.tex 
+* parskip.pdf 
+* parskip.tex 
+
+
+## CTAN manifest
+
+The following group lists the files included in the CTAN package.
+
+### CTAN files
+
+* MANIFEST.md 
+* README.md 
+* changes.txt 
+* parskip-2001-04-09.sty 
+* parskip-code.pdf 
+* parskip-code.tex 
+* parskip.dtx 
+* parskip.ins 
+* parskip.pdf 
+* parskip.tex 
diff --git a/Master/texmf-dist/doc/latex/parskip/changes.txt b/Master/texmf-dist/doc/latex/parskip/changes.txt
index 6ada7d93b61..db84ddd38b8 100644
--- a/Master/texmf-dist/doc/latex/parskip/changes.txt
+++ b/Master/texmf-dist/doc/latex/parskip/changes.txt
@@ -1,3 +1,17 @@
+#### placed on CTAN as 2.0e ####
+
+2020-05-19  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* parskip.dtx (subsubsection{TOCs and similar lists}):
+	Add tocskip option to set the \parskip value inside \tableofcontents
+	and similar lists (default is 0pt as before)
+
+2020-05-18  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* parskip.dtx (subsubsection{TOCs and similar lists}):
+	Fix space at start of \@starttoc (noticable with large skip= values)
+	(gh/12)
+
 #### placed on CTAN as 2.0d ####
 
 	2020-01-22  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
diff --git a/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf b/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf
index 1127576e80d..becb2250a98 100644
--- a/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf
+++ b/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf
diff --git a/Master/texmf-dist/doc/latex/parskip/parskip.pdf b/Master/texmf-dist/doc/latex/parskip/parskip.pdf
index 3672f9caf79..bb9dff02603 100644
--- a/Master/texmf-dist/doc/latex/parskip/parskip.pdf
+++ b/Master/texmf-dist/doc/latex/parskip/parskip.pdf
diff --git a/Master/texmf-dist/source/latex/parskip/parskip.dtx b/Master/texmf-dist/source/latex/parskip/parskip.dtx
index dd0a6b07dfe..eea08157f68 100644
--- a/Master/texmf-dist/source/latex/parskip/parskip.dtx
+++ b/Master/texmf-dist/source/latex/parskip/parskip.dtx
@@ -107,6 +107,12 @@
 %    specify the vertical space between paragraphs. If the option is
 %    not given (or given without a value) then \verb=.5\baselineskip=
 %   plus \texttt{2pt} of stretch is assumed.
+% \item[\option{tocskip}]
+%    By default the \cs{parskip} is zero within \cs{tableofcontents}
+%    and similar lists, regardless of its value elsewhere. With the
+%    option \texttt{tocskip} it can be given a different value. If
+%    used without an explicit value you get the same \cs{parskip} as elsewhere
+%    within these lists.
 % \item[\option{indent}]
 %    With the package option \texttt{indent} it is possible to explicitly set
 %    the paragraph indentation. Using this option without a value keeps the
@@ -177,7 +183,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{parskip}[2020-01-22 v2.0d non-zero parskip adjustments]
+\ProvidesPackage{parskip}[2020-05-19 v2.0e non-zero parskip adjustments]
 %    \end{macrocode}
 %
 %
@@ -218,6 +224,14 @@
 \DeclareStringOption{skip}
 %    \end{macrocode}
 %
+%    The key \option{tocskip} defines the vertical separation inside the lists
+%    \cs{tableofcontents}, \cs{listoffigures} and \cs{listoftables}. By
+%    default there is no extra separatation (i.e., \texttt{0pt}). If
+%    specified without a value the standard \cs{parskip} is used,
+%    otherwise the given value.
+%    \begin{macrocode}
+\DeclareStringOption[0pt]{tocskip}[\parskip]
+%    \end{macrocode}
 %
 %   Execute any package options:
 %    \begin{macrocode}
@@ -319,12 +333,39 @@
 % Within a table of contents or a list of figures we don't want any
 % additional vertical spacing just because the individual lines in
 % such a list are implemented as one-line paragraphs. So we locally
-% set the \cs{parskip} to zero. Should be really something that is
+% set the \cs{parskip} to zero by default. Should be really something that is
 % done already in \LaTeX{}.
+% \changes{v2.0e}{2020/05/19}{Fix space at start of \cs{@starttoc} (gh/12)}
 %    \begin{macrocode}
 \patchcmd\@starttoc
     {\begingroup \makeatletter}
-    {\begingroup \makeatletter \parskip\z@}
+    {\begingroup \makeatletter
+%    \end{macrocode}
+%    Just setting \cs{parskip} to zero as it was done in the original
+%    version of the package, does not always work. If the list starts
+%    out with an ordinary paragraph (and not with \cs{addvspace} as it
+%    usually does) we will get a zero \cs{parskip} but the heading
+%    above assumes we get the normal \cs{parskip} and has therefore
+%    removed that amount from its own vertical skip. As long as the
+%    parskip value is not too large people didn't notice that heading
+%    and list moved closer to each other but if you use, say,
+%    \texttt{[skip=20pt]} you will even see an overlap.
+%
+%    We therefore do the following: we look at the last skip, undo it
+%    and then issue a skip that is equal to \cs{parskip} +
+%    \cs{lastskip}.
+%     This way the skip seen by any following code has the right value
+%    which is important for \cs{addvspace} calulations. Only then we
+%    locally set \cs{parskip} to zero or rather to
+%    \cs{parskip@tocskip}, the parameter that the user can set through
+%    an option.
+% \changes{v2.0e}{2020/05/19}{Add \texttt{tocskip} option}
+%    \begin{macrocode}
+      \skip@\lastskip
+      \advance\skip@\parskip
+      \vskip-\lastskip
+      \vskip\skip@
+      \parskip\parskip@tocskip}
     {}{\typeout{Couldn't patch \string\@starttoc}}
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/tex/latex/parskip/parskip.sty b/Master/texmf-dist/tex/latex/parskip/parskip.sty
index a575adbd79e..5680a59c78c 100644
--- a/Master/texmf-dist/tex/latex/parskip/parskip.sty
+++ b/Master/texmf-dist/tex/latex/parskip/parskip.sty
@@ -40,12 +40,13 @@
 
 \DeclareRelease       {v1}{2001-04-09}{parskip-2001-04-09.sty}
 \DeclareCurrentRelease{v2}{2018-08-24}
-\ProvidesPackage{parskip}[2020-01-22 v2.0d non-zero parskip adjustments]
+\ProvidesPackage{parskip}[2020-05-19 v2.0e non-zero parskip adjustments]
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{family=parskip,prefix=parskip@}
 \DeclareStringOption[0pt]{indent}[\parindent]
 \DeclareStringOption[0pt]{parfill}[30pt]
 \DeclareStringOption{skip}
+\DeclareStringOption[0pt]{tocskip}[\parskip]
 \ProcessKeyvalOptions*
 \ifx\parskip@skip\@empty
   \parskip.5\baselineskip
@@ -72,7 +73,12 @@
 \fi
 \patchcmd\@starttoc
     {\begingroup \makeatletter}
-    {\begingroup \makeatletter \parskip\z@}
+    {\begingroup \makeatletter
+      \skip@\lastskip
+      \advance\skip@\parskip
+      \vskip-\lastskip
+      \vskip\skip@
+      \parskip\parskip@tocskip}
     {}{\typeout{Couldn't patch \string\@starttoc}}
 \patchcmd\@startsection
     {\addvspace\@tempskipa}