From b05d2d5a5eb1e02a4f1c7509b68c8faa9e5a8840 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 30 Sep 2010 22:57:21 +0000 Subject: parskip its own package (30sep10) git-svn-id: svn://tug.org/texlive/trunk@19963 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/parskip/parskip-doc.pdf | Bin 0 -> 174758 bytes .../texmf-dist/doc/latex/parskip/parskip-doc.tex | 58 ++++++++++++++ Master/texmf-dist/tex/latex/ltxmisc/parskip.sty | 87 --------------------- Master/texmf-dist/tex/latex/parskip/parskip.sty | 87 +++++++++++++++++++++ Master/tlpkg/bin/tlpkg-ctan-check | 2 +- .../tlpsrc/collection-latexrecommended.tlpsrc | 1 + Master/tlpkg/tlpsrc/parskip.tlpsrc | 0 7 files changed, 147 insertions(+), 88 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/parskip/parskip-doc.pdf create mode 100644 Master/texmf-dist/doc/latex/parskip/parskip-doc.tex delete mode 100644 Master/texmf-dist/tex/latex/ltxmisc/parskip.sty create mode 100644 Master/texmf-dist/tex/latex/parskip/parskip.sty create mode 100644 Master/tlpkg/tlpsrc/parskip.tlpsrc (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/parskip/parskip-doc.pdf b/Master/texmf-dist/doc/latex/parskip/parskip-doc.pdf new file mode 100644 index 00000000000..16e37dae870 Binary files /dev/null and b/Master/texmf-dist/doc/latex/parskip/parskip-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/parskip/parskip-doc.tex b/Master/texmf-dist/doc/latex/parskip/parskip-doc.tex new file mode 100644 index 00000000000..1954bb93ea2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/parskip/parskip-doc.tex @@ -0,0 +1,58 @@ +\documentclass[pagesize=auto, fontsize=14pt, DIV=10, parskip=half]{scrartcl} + +\usepackage{fixltx2e} +\usepackage{etex} +\usepackage{lmodern} +\usepackage[T1]{fontenc} +\usepackage{textcomp} +\usepackage{booktabs} +\usepackage{microtype} +\usepackage{hyperref} + +\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}} +\newcommand*{\pkg}[1]{\textsf{#1}} +\newcommand*{\cls}[1]{\textsf{#1}} +\newcommand*{\cs}[1]{\texttt{\textbackslash#1}} +\makeatletter +\newcommand*{\cmd}[1]{\cs{\expandafter\@gobble\string#1}} +\makeatother + +\addtokomafont{title}{\rmfamily} + +\title{The \pkg{parskip} package} +\author{H. Partl\and Robin Fairbairns\thanks{\mail{rf10@cam.ac.uk}}} +\date{2001/04/09} + + +\begin{document} + +\maketitle + +This is \texttt{parskip.sty} by H.~Partl, TU Wien, as of 19 Jan 1989. +Addition (originally from Donald Arseneau) added 2001-12-13 by Robin +Fairbairns. + +Package to be used with any document class at any size. +It produces the following Paragraph Layout: + +\begin{quote} + Zero Parindent and non-zero Parskip. The stretchable glue in \cmd{\parskip} + helps \LaTeX\ in finding the best place for page breaks. +\end{quote} + +In addition, the package adjusts the skips between list items. + +With package option \texttt{parfill}, the package also adjusts +\cmd\parfillskip{} to impose a minimum space at the end of +the last line of a paragraph. + +This package is no more than quick fix; the `proper' way to achieve +effects as far-reaching as this is to create a new class. An +example class is to be found in the \cls{ntgclass} set: +\cls{artikel3.cls} + +The \cls{koma-script} bundle classes and the \cls{memoir} class all +provide similar functionality, and their respective documentation +files discuss the pros (such as they are) and cons of this approach. + +\end{document} diff --git a/Master/texmf-dist/tex/latex/ltxmisc/parskip.sty b/Master/texmf-dist/tex/latex/ltxmisc/parskip.sty deleted file mode 100644 index c5ca5768349..00000000000 --- a/Master/texmf-dist/tex/latex/ltxmisc/parskip.sty +++ /dev/null @@ -1,87 +0,0 @@ -% parskip.sty; last edited by Robin Fairbairns (rf10@cam.ac.uk), -% derived from: -% -% This is PARSKIP.STY by H.Partl, TU Wien, as of 19 Jan 1989. -% -% Package to be used with any document class at any size. -% It produces the following Paragraph Layout: -% Zero Parindent and non-zero Parskip. The stretchable glue in \parskip -% helps LaTeX in finding the best place for page breaks. -% -% This package is no more than quick fix; the `proper' way to achieve -% effects as far-reaching as this is to create a new class. An -% example class is to be found in the ntgclass set: artikel3.cls - -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{parskip}[2001/04/09 non-zero parskip adjustments] - -\parskip=0.5\baselineskip \advance\parskip by 0pt plus 2pt -\parindent=\z@ - -% -% from a suggestion by Donald Arseneau on comp.text.tex: - -\DeclareOption{parfill}{\setlength{\parfillskip}{30\p@ \@plus 1fil}} -\ProcessOptions - -% To accompany this, the vertical spacing in the list environments is changed -% to use the same as \parskip in all relevant places (for normalsize only): -% \parsep = \parskip -% \itemsep = \z@ % add nothing to \parskip between items -% \topsep = \z@ % add nothing to \parskip before first item - -\def\@listI{\leftmargin\leftmargini - \topsep\z@ \parsep\parskip \itemsep\z@} -\let\@listi\@listI -\@listi - -\def\@listii{\leftmargin\leftmarginii - \labelwidth\leftmarginii\advance\labelwidth-\labelsep - \topsep\z@ \parsep\parskip \itemsep\z@} - -\def\@listiii{\leftmargin\leftmarginiii - \labelwidth\leftmarginiii\advance\labelwidth-\labelsep - \topsep\z@ \parsep\parskip \itemsep\z@} - -% and, now... -% \partopsep = \z@ % don't even add anything before first item (beyond -% % \parskip) even if the list is preceded by a blank line -\partopsep=\z@ - -% Note that listiv, listv and listvi don't change vertical parameters. - -% deal with a problem raised on comp.text.tex in april 2001 -% -% don't expand the table of contents any further -% -% first: check that the definition of \@starttoc is unchanged from -% that in latex.ltx -\@ifundefined{CheckCommand}{}{% - \CheckCommand*{\@starttoc}[1]{% - \begingroup - \makeatletter - \@input{\jobname.#1}% - \if@filesw - \expandafter\newwrite\csname tf@#1\endcsname - \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax - \fi - \@nobreakfalse - \endgroup}} -% -% now having generated any warning that might help, redefine -\renewcommand*{\@starttoc}[1]{% - \begingroup - \makeatletter - \parskip\z@ - \@input{\jobname.#1}% - \if@filesw - \expandafter\newwrite\csname tf@#1\endcsname - \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax - \fi - \@nobreakfalse - \endgroup -} - -\endinput - - diff --git a/Master/texmf-dist/tex/latex/parskip/parskip.sty b/Master/texmf-dist/tex/latex/parskip/parskip.sty new file mode 100644 index 00000000000..c5ca5768349 --- /dev/null +++ b/Master/texmf-dist/tex/latex/parskip/parskip.sty @@ -0,0 +1,87 @@ +% parskip.sty; last edited by Robin Fairbairns (rf10@cam.ac.uk), +% derived from: +% +% This is PARSKIP.STY by H.Partl, TU Wien, as of 19 Jan 1989. +% +% Package to be used with any document class at any size. +% It produces the following Paragraph Layout: +% Zero Parindent and non-zero Parskip. The stretchable glue in \parskip +% helps LaTeX in finding the best place for page breaks. +% +% This package is no more than quick fix; the `proper' way to achieve +% effects as far-reaching as this is to create a new class. An +% example class is to be found in the ntgclass set: artikel3.cls + +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{parskip}[2001/04/09 non-zero parskip adjustments] + +\parskip=0.5\baselineskip \advance\parskip by 0pt plus 2pt +\parindent=\z@ + +% +% from a suggestion by Donald Arseneau on comp.text.tex: + +\DeclareOption{parfill}{\setlength{\parfillskip}{30\p@ \@plus 1fil}} +\ProcessOptions + +% To accompany this, the vertical spacing in the list environments is changed +% to use the same as \parskip in all relevant places (for normalsize only): +% \parsep = \parskip +% \itemsep = \z@ % add nothing to \parskip between items +% \topsep = \z@ % add nothing to \parskip before first item + +\def\@listI{\leftmargin\leftmargini + \topsep\z@ \parsep\parskip \itemsep\z@} +\let\@listi\@listI +\@listi + +\def\@listii{\leftmargin\leftmarginii + \labelwidth\leftmarginii\advance\labelwidth-\labelsep + \topsep\z@ \parsep\parskip \itemsep\z@} + +\def\@listiii{\leftmargin\leftmarginiii + \labelwidth\leftmarginiii\advance\labelwidth-\labelsep + \topsep\z@ \parsep\parskip \itemsep\z@} + +% and, now... +% \partopsep = \z@ % don't even add anything before first item (beyond +% % \parskip) even if the list is preceded by a blank line +\partopsep=\z@ + +% Note that listiv, listv and listvi don't change vertical parameters. + +% deal with a problem raised on comp.text.tex in april 2001 +% +% don't expand the table of contents any further +% +% first: check that the definition of \@starttoc is unchanged from +% that in latex.ltx +\@ifundefined{CheckCommand}{}{% + \CheckCommand*{\@starttoc}[1]{% + \begingroup + \makeatletter + \@input{\jobname.#1}% + \if@filesw + \expandafter\newwrite\csname tf@#1\endcsname + \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax + \fi + \@nobreakfalse + \endgroup}} +% +% now having generated any warning that might help, redefine +\renewcommand*{\@starttoc}[1]{% + \begingroup + \makeatletter + \parskip\z@ + \@input{\jobname.#1}% + \if@filesw + \expandafter\newwrite\csname tf@#1\endcsname + \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax + \fi + \@nobreakfalse + \endgroup +} + +\endinput + + diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index dc432f96c6a..ce47129248a 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -238,7 +238,7 @@ my @TLP_working = qw( onlyamsmath onrannual opcit optional ordinalpt orkhun ot-tableau othello oubraces outline overpic pagecont pagenote pagerange pagesLTS paper papercdcase papermas papertex - paralist parallel paresse parrun passivetex + paralist parallel paresse parrun parskip passivetex patch patchcmd patgen2-tutorial path pauldoc pax pbox pb-diagram pdf14 pdf-forms-tutorial-de pdf-forms-tutorial-en pdf-trans pdfcomment pdfcprot pdfcrop pdfjam pdfmarginpar diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc index 5a1a57908bd..fb2ce438a1d 100644 --- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc @@ -30,6 +30,7 @@ depend metalogo depend microtype depend ms depend ntgclass +depend parskip depend pdfpages depend powerdot depend psfrag diff --git a/Master/tlpkg/tlpsrc/parskip.tlpsrc b/Master/tlpkg/tlpsrc/parskip.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d -- cgit v1.2.3