From 46922e9155dc9c6d226041dacd922802da32fa95 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 16 Jan 2019 22:27:54 +0000 Subject: parskip (16jan19) git-svn-id: svn://tug.org/texlive/trunk@49730 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/parskip/changes.txt | 12 +++++++ .../texmf-dist/doc/latex/parskip/parskip-code.pdf | Bin 222808 -> 224255 bytes Master/texmf-dist/doc/latex/parskip/parskip.pdf | Bin 175250 -> 175252 bytes Master/texmf-dist/source/latex/parskip/parskip.dtx | 35 ++++++++++++++++----- Master/texmf-dist/tex/latex/parskip/parskip.sty | 16 +++++++--- 5 files changed, 50 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/parskip/changes.txt b/Master/texmf-dist/doc/latex/parskip/changes.txt index e687a0f817f..e76b860cb9f 100644 --- a/Master/texmf-dist/doc/latex/parskip/changes.txt +++ b/Master/texmf-dist/doc/latex/parskip/changes.txt @@ -1,3 +1,15 @@ +2019-01-16 Frank Mittelbach + + * parskip.dtx (subsubsection{Option handling}): + Support calc package by using \setlength for assignments + +2018-09-17 Frank Mittelbach + + * parskip.dtx (subsubsection{\pkg{amsthm} theorems}): + Support amsthm (sx/450551) + +#### placed on CTAN as 2.0a #### + 2018-08-24 Frank Mittelbach * parskip.dtx version 2.0 with options indent + skip and diff --git a/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf b/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf index b21904b4670..453269b7388 100644 Binary files a/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf and b/Master/texmf-dist/doc/latex/parskip/parskip-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/parskip/parskip.pdf b/Master/texmf-dist/doc/latex/parskip/parskip.pdf index 05436ca07f5..9d13c7e913b 100644 Binary files a/Master/texmf-dist/doc/latex/parskip/parskip.pdf and b/Master/texmf-dist/doc/latex/parskip/parskip.pdf differ diff --git a/Master/texmf-dist/source/latex/parskip/parskip.dtx b/Master/texmf-dist/source/latex/parskip/parskip.dtx index be894e39a8a..731cb2a9f44 100644 --- a/Master/texmf-dist/source/latex/parskip/parskip.dtx +++ b/Master/texmf-dist/source/latex/parskip/parskip.dtx @@ -3,7 +3,7 @@ %% File: parskip.dtx %% (C) Copyright 1989 H.Partl, TU Wien %% (C) Copyright 2001 Robin Fairbairns -%% (C) Copyright 2018 Frank Mittelbach +%% (C) Copyright 2018-2019 Frank Mittelbach % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -76,7 +76,7 @@ % % This file was originally developed by Hubert Partl in 1989 (i.e., % for \LaTeX\,2.09) to provide a somewhat crude solution to an -% existing problem (in case no proper document class (back then called +% existing problem in case no proper document class (back then called % document style) support was available. % % About ten years later Robin Fairbairns picked up the orphaned @@ -119,13 +119,13 @@ % With package option \texttt{parfill}, the package also adjusts % \cs{parfillskip} to impose a minimum space at the end of % the last line of a paragraph. If specified without a value then -% \texttt{30pt} are assumed, if a value is given that that forms the minimum. +% \texttt{30pt} are assumed, if a value is given that forms the minimum. % \end{description} % % % \section{Differences to the original package} % -% If the package us used without any options or just with the option +% If the package is used without any options or just with the option % \option{parfill} it behaves like the earlier version, except that now % the spacing around headings is also adjusted (not adding extra % \cs{parskip}). If this is not desirable when processing an old @@ -177,7 +177,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesPackage{parskip}[2018-08-24 v2.0a non-zero parskip adjustments] +\ProvidesPackage{parskip}[2019-01-16 v2.0c non-zero parskip adjustments] % \end{macrocode} % % @@ -238,20 +238,22 @@ \else % \end{macrocode} % Otherwise set it to the specified value: +% \changes{v2.0c}{2019/02/16}{Support calc by using \cs{setlength} +% for assignments} % \begin{macrocode} - \parskip\parskip@skip\relax + \setlength\parskip\parskip@skip \fi % \end{macrocode} % Setting \cs{parfillskip} was suggested by Donald Arseneau at some % point on comp.text.tex: % \begin{macrocode} -\parfillskip \parskip@parfill\relax +\setlength\parfillskip\parskip@parfill \advance\parfillskip 0pt plus 1fil\relax % \end{macrocode} % \cs{parindent} gets whatever was specified. If the key was given % without an option this will essentially reassign the now ``current'' value. % \begin{macrocode} -\parindent\parskip@indent\relax +\setlength\parindent\parskip@indent % \end{macrocode} % % @@ -390,6 +392,23 @@ % % % +% \subsubsection{\pkg{amsthm} theorems} +% +% The \pkg{amsthm} package is one of the few packages that make an +% explicit correction for \cs{parskip} which isn't any longer adequate +% if this \pkg{parskip} package is loaded. We therefore remove that +% setting from the package if it was loaded. +% \changes{v2.0b}{2018/09/17}{Support \cs{amsthm} (sx/450551)} +% \begin{macrocode} +\AtBeginDocument{% +\ifx\deferred@thm@head\@undefined\else % amsthm got loaded +\patchcmd\deferred@thm@head + {\addvspace{-\parskip}}{}% + {}{\typeout{Couldn't patch \string\deferred@thm@head!}}% +\fi} +% \end{macrocode} +% +% % \subsection{Closing shop} % diff --git a/Master/texmf-dist/tex/latex/parskip/parskip.sty b/Master/texmf-dist/tex/latex/parskip/parskip.sty index 0b5943d0747..5e3b3dbc4b6 100644 --- a/Master/texmf-dist/tex/latex/parskip/parskip.sty +++ b/Master/texmf-dist/tex/latex/parskip/parskip.sty @@ -35,12 +35,12 @@ %% File: parskip.dtx %% (C) Copyright 1989 H.Partl, TU Wien %% (C) Copyright 2001 Robin Fairbairns -%% (C) Copyright 2018 Frank Mittelbach +%% (C) Copyright 2018-2019 Frank Mittelbach \NeedsTeXFormat{LaTeX2e}[2018-04-01] \DeclareRelease {v1}{2001-04-09}{parskip-2001-04-09.sty} \DeclareCurrentRelease{v2}{2018-08-24} -\ProvidesPackage{parskip}[2018-08-24 v2.0a non-zero parskip adjustments] +\ProvidesPackage{parskip}[2019-01-16 v2.0c non-zero parskip adjustments] \RequirePackage{kvoptions} \SetupKeyvalOptions{family=parskip,prefix=parskip@} \DeclareStringOption[0pt]{indent}[\parindent] @@ -51,11 +51,11 @@ \parskip.5\baselineskip \advance\parskip 0pt plus 2pt\relax \else - \parskip\parskip@skip\relax + \setlength\parskip\parskip@skip \fi -\parfillskip \parskip@parfill\relax +\setlength\parfillskip\parskip@parfill \advance\parfillskip 0pt plus 1fil\relax -\parindent\parskip@indent\relax +\setlength\parindent\parskip@indent \RequirePackage{etoolbox} \ifdim \parskip > 0pt \def\@listI{\leftmargin\leftmargini @@ -109,6 +109,12 @@ {\advance\@tempskipb-\parskip \vspace\@tempskipb}% {}{\typeout{Couldn't patch \string\ttl@page@ii}}% \fi} +\AtBeginDocument{% +\ifx\deferred@thm@head\@undefined\else % amsthm got loaded +\patchcmd\deferred@thm@head + {\addvspace{-\parskip}}{}% + {}{\typeout{Couldn't patch \string\deferred@thm@head!}}% +\fi} \endinput %% -- cgit v1.2.3