summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-06-15 20:42:53 +0000
committerKarl Berry <karl@freefriends.org>2020-06-15 20:42:53 +0000
commit93149e68a9a7e4c41183cda27b7a494de6edeb40 (patch)
tree3eec66df4de1122e04fe5fb4b2607f145a27613e
parent14cedc26959371771ab85ac7870a90171686c0bd (diff)
parskip (15jun20)
git-svn-id: svn://tug.org/texlive/trunk@55560 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/parskip/MANIFEST.md2
-rw-r--r--Master/texmf-dist/doc/latex/parskip/changes.txt7
-rw-r--r--Master/texmf-dist/doc/latex/parskip/parskip-code.pdfbin226081 -> 226324 bytes
-rw-r--r--Master/texmf-dist/doc/latex/parskip/parskip.pdfbin175049 -> 175119 bytes
-rw-r--r--Master/texmf-dist/source/latex/parskip/parskip.dtx18
-rw-r--r--Master/texmf-dist/tex/latex/parskip/parskip.sty7
6 files changed, 22 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/parskip/MANIFEST.md b/Master/texmf-dist/doc/latex/parskip/MANIFEST.md
index ec8a0eebe0b..349bd5e50c0 100644
--- a/Master/texmf-dist/doc/latex/parskip/MANIFEST.md
+++ b/Master/texmf-dist/doc/latex/parskip/MANIFEST.md
@@ -58,6 +58,7 @@ the same output. These output files are sometimes shared and sometime specific f
different engines (pdfTeX, XeTeX, LuaTeX, etc.).
* github-0012.lvt
+* github-0014.lvt
* parskip-000.lvt
* parskip-001.lvt
* parskip-002.lvt
@@ -67,6 +68,7 @@ different engines (pdfTeX, XeTeX, LuaTeX, etc.).
* parskip-006.lvt
* sx-450551.lvt
* github-0012.tlg
+* github-0014.tlg
* parskip-000.tlg
* parskip-001.tlg
* parskip-002.tlg
diff --git a/Master/texmf-dist/doc/latex/parskip/changes.txt b/Master/texmf-dist/doc/latex/parskip/changes.txt
index db84ddd38b8..6cdccbc1d55 100644
--- a/Master/texmf-dist/doc/latex/parskip/changes.txt
+++ b/Master/texmf-dist/doc/latex/parskip/changes.txt
@@ -1,3 +1,10 @@
+#### placed on CTAN as 2.0f ####
+
+2020-06-15 Frank Mittelbach <Frank.Mittelbach@latex-project.org>
+
+ * parskip.dtx (subsubsection{Option handling}):
+ Allow skip key without value without a package error (gh/14)
+
#### placed on CTAN as 2.0e ####
2020-05-19 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 becb2250a98..0aebb0a149e 100644
--- a/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf
+++ b/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/parskip/parskip.pdf b/Master/texmf-dist/doc/latex/parskip/parskip.pdf
index bb9dff02603..37bac82767c 100644
--- a/Master/texmf-dist/doc/latex/parskip/parskip.pdf
+++ b/Master/texmf-dist/doc/latex/parskip/parskip.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/parskip/parskip.dtx b/Master/texmf-dist/source/latex/parskip/parskip.dtx
index eea08157f68..6b4f87b48b0 100644
--- a/Master/texmf-dist/source/latex/parskip/parskip.dtx
+++ b/Master/texmf-dist/source/latex/parskip/parskip.dtx
@@ -183,7 +183,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesPackage{parskip}[2020-05-19 v2.0e non-zero parskip adjustments]
+\ProvidesPackage{parskip}[2020-06-15 v2.0f non-zero parskip adjustments]
% \end{macrocode}
%
%
@@ -219,9 +219,11 @@
% flexibility. If given, one need to provide an explicit value which
% is then used as a separation (and it needs to contain any extra
% stretch if that is wanted, i.e., there is no extra stretch added
-% in this case).
+% in this case).
+% \changes{v2.0f}{2020/06/15}{Allow \texttt{skip} key without value
+% without a package error (gh/14)}
% \begin{macrocode}
-\DeclareStringOption{skip}
+\DeclareStringOption{skip}[]
% \end{macrocode}
%
% The key \option{tocskip} defines the vertical separation inside the lists
@@ -244,11 +246,10 @@
\ifx\parskip@skip\@empty
% \end{macrocode}
% If no \option{skip} was given (or it was empty) set \cs{parskip}
-% to \verb=.5\baselineskip= plus \texttt{2pt} stretch. This has to
-% be done in 2 steps as \cs{baselineskip} might already contain a stretch.
+% to half of \verb=.5\baselineskip= plus \texttt{2pt} stretch. Stretch
+% or shrink inside \cs{baselineskip} is ignored in this case.
% \begin{macrocode}
- \parskip.5\baselineskip
- \advance\parskip 0pt plus 2pt\relax
+ \parskip=.5\baselineskip plus 2pt\relax
\else
% \end{macrocode}
% Otherwise set it to the specified value:
@@ -294,7 +295,8 @@
% \topsep = \z@ % add nothing to \parskip before first item
%\end{verbatim}
%
-% However, if the user explicitly asked for a zero parskip (via the \option{skip} option) we
+% However, if the user explicitly asked for a zero parskip (via the
+% \option{skip} option) we
% shouldn't do this but rather keep the default list settings, so
% we better check for this.
%
diff --git a/Master/texmf-dist/tex/latex/parskip/parskip.sty b/Master/texmf-dist/tex/latex/parskip/parskip.sty
index 5680a59c78c..71b0946079e 100644
--- a/Master/texmf-dist/tex/latex/parskip/parskip.sty
+++ b/Master/texmf-dist/tex/latex/parskip/parskip.sty
@@ -40,17 +40,16 @@
\DeclareRelease {v1}{2001-04-09}{parskip-2001-04-09.sty}
\DeclareCurrentRelease{v2}{2018-08-24}
-\ProvidesPackage{parskip}[2020-05-19 v2.0e non-zero parskip adjustments]
+\ProvidesPackage{parskip}[2020-06-15 v2.0f non-zero parskip adjustments]
\RequirePackage{kvoptions}
\SetupKeyvalOptions{family=parskip,prefix=parskip@}
\DeclareStringOption[0pt]{indent}[\parindent]
\DeclareStringOption[0pt]{parfill}[30pt]
-\DeclareStringOption{skip}
+\DeclareStringOption{skip}[]
\DeclareStringOption[0pt]{tocskip}[\parskip]
\ProcessKeyvalOptions*
\ifx\parskip@skip\@empty
- \parskip.5\baselineskip
- \advance\parskip 0pt plus 2pt\relax
+ \parskip=.5\baselineskip plus 2pt\relax
\else
\setlength\parskip\parskip@skip
\fi