From c19fd7a91320f5e043b734fb65f2fd10af4e9cd2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Dec 2022 21:24:57 +0000 Subject: setspace (5dec22) git-svn-id: svn://tug.org/texlive/trunk@65206 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/setspace/README | 13 ---- Master/texmf-dist/doc/latex/setspace/README.md | 13 ++++ .../texmf-dist/doc/latex/setspace/setspace-doc.pdf | Bin 0 -> 197440 bytes .../texmf-dist/doc/latex/setspace/setspace-doc.tex | 66 +++++++++++++++++++++ .../doc/latex/setspace/setspace-test.tex | 24 -------- Master/texmf-dist/tex/latex/setspace/setspace.sty | 47 ++++++++------- 6 files changed, 103 insertions(+), 60 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/setspace/README create mode 100644 Master/texmf-dist/doc/latex/setspace/README.md create mode 100644 Master/texmf-dist/doc/latex/setspace/setspace-doc.pdf create mode 100644 Master/texmf-dist/doc/latex/setspace/setspace-doc.tex delete mode 100644 Master/texmf-dist/doc/latex/setspace/setspace-test.tex (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/setspace/README b/Master/texmf-dist/doc/latex/setspace/README deleted file mode 100644 index 08b35258693..00000000000 --- a/Master/texmf-dist/doc/latex/setspace/README +++ /dev/null @@ -1,13 +0,0 @@ -setspace -- control line spacing in latex documents - -This release is a transitional one, with code unchanged from Geoffrey -Tobin's LaTeX 2.09 original, except for patches that avoid a problem -with \@setsize, when the package is used with other 2.09 packages -under LaTeX 2e. - -The package now acts "natively" as a 2e package under LaTeX 2e, and -(insofar as is possibe) as a 2.09 package under LaTeX 2.09. - -Please report any problems to Robin Fairbairns -(A revised version of setspace-test.tex, that shows the problem -reported, will be much appreciated.) diff --git a/Master/texmf-dist/doc/latex/setspace/README.md b/Master/texmf-dist/doc/latex/setspace/README.md new file mode 100644 index 00000000000..16e5d5bbac7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/setspace/README.md @@ -0,0 +1,13 @@ +# setspace +## control line spacing in latex documents + +The code is unchanged from Geoffrey +Tobin's LaTeX 2.09 original, except for patches that avoid a problem +with \@setsize, when the package is used with other 2.09 packages +under LaTeX 2e, and updates to match updates in the original LaTeX +definitions. + + +Please report any problems to +https://github.com/latex-package-repositories/setspace/issues + diff --git a/Master/texmf-dist/doc/latex/setspace/setspace-doc.pdf b/Master/texmf-dist/doc/latex/setspace/setspace-doc.pdf new file mode 100644 index 00000000000..b65afdafa81 Binary files /dev/null and b/Master/texmf-dist/doc/latex/setspace/setspace-doc.pdf differ diff --git a/Master/texmf-dist/doc/latex/setspace/setspace-doc.tex b/Master/texmf-dist/doc/latex/setspace/setspace-doc.tex new file mode 100644 index 00000000000..1a3371f0e23 --- /dev/null +++ b/Master/texmf-dist/doc/latex/setspace/setspace-doc.tex @@ -0,0 +1,66 @@ +\documentclass[a4paper]{article} +\usepackage{lmodern} +\usepackage{verbatim} +\usepackage{setspace} +\makeatletter +\def\pkginfo#1 #2 #3\relax{% +\def\filedate{#1}% +\def\fileversion{#2}% +} +\expandafter\expandafter\expandafter\pkginfo\csname ver@setspace.sty\endcsname\relax +\makeatother +\title{The setspace Package\thanks{Currently maintained by David Carlisle and others at\\\texttt{https://github.com/latex-package-repositories/setspace/issues}}} +\date{\filedate} +\author{Geoffrey Tobin\and Robin Fairbairns} +\begin{document} + +\maketitle + + Usage: + +\begin{verbatim} + \documentclass[...]{...} + \usepackage{setspace} +\end{verbatim} + + + This package (originally based on the \texttt{doublespace} \LaTeX\,2.09 style + option (package), created by Stephen Page) + provides commands and environments for doing double and + one-and-a-half spacing based on the font size. + + Single spacing is the default. + + The commands \verb|\singlespacing|, \verb|\onehalfspacing|, and + \verb|\doublespacing|, are for use in the preamble to set the overall + spacing for the document. If a different spacing is required then + the \verb|\setstretch{baselinestretch}| command can be used in the + preamble to set the baselinestretch appropriately. The default + spacing with this style option is single spacing. + + Three environments, \verb|singlespace|, \verb|onehalfspace|, + and \verb|doublespace|, allow the spacing to be changed + within the document. Both the \verb|onehalfspace| and + \verb|doublespace| environments are intended to increase the + spacing, so the \verb|onehalfspace| environment should not be + used in a double spaced document. + + If an increased spacing different from one-and-a-half or + double spacing is required then the spacing environment can + be used. The \verb|spacing| environment takes one argument + which is the larger baselinestretch to use, e.g.,\\ + \verb|\begin{spacing}{2.5}|. + + \verb|\footins| is adjusted in the same wayas \verb|\parskip|. + + +\clearpage +\addtolength\textwidth{100pt} +\addtolength\oddsidemargin{-70pt} +\setlength\columnseprule{1pt} +\setlength\columnsep{10pt} +\twocolumn +\tiny +\verbatiminput{setspace.sty} + +\end{document} diff --git a/Master/texmf-dist/doc/latex/setspace/setspace-test.tex b/Master/texmf-dist/doc/latex/setspace/setspace-test.tex deleted file mode 100644 index 55ccbf216fa..00000000000 --- a/Master/texmf-dist/doc/latex/setspace/setspace-test.tex +++ /dev/null @@ -1,24 +0,0 @@ -\documentclass{article} -\usepackage{setspace} -\usepackage{lipsum} -\onehalfspacing -\begin{document} -\title{merry setspace christmas test} -\author{who cares?} -\date{2011-12-19} -\maketitle - -\section{dummy} -\lipsum[1] -\subsection{first offspring} -\lipsum[2] -\begin{tabular}{llr} - a & silly & story about latex \\ - silly & a & story -\end{tabular} -\end{document} - -%%% Local Variables: -%%% mode: latex -%%% TeX-master: t -%%% End: diff --git a/Master/texmf-dist/tex/latex/setspace/setspace.sty b/Master/texmf-dist/tex/latex/setspace/setspace.sty index aa97a31ef4f..58ed5ac9b7f 100644 --- a/Master/texmf-dist/tex/latex/setspace/setspace.sty +++ b/Master/texmf-dist/tex/latex/setspace/setspace.sty @@ -1,5 +1,6 @@ % \iffalse meta-comment % +% Copyright (C) 2022 by LaTeX Team % Copyright (C) 2011 by Robin Fairbairns (rf10@cam.ac.uk) % Copyright (C) 2000 by Geoffrey Tobin % @@ -23,23 +24,12 @@ %%% ====================================================================== %%% @LaTeX-style-file{ %%% filename = "setspace.sty", -%%% version = "6.7a", -%%% date = "Fri 1 December 2000", -%%% time = "17:49 UT+11", -%%% author = "Geoffrey Tobin", -%%% address = "Department of Electronic Engineering -%%% Faculty of Science and Technology -%%% La Trobe University -%%% Bundoora VIC 3086 -%%% Australia", -%%% email = "G.Tobin@latrobe.edu.au (Internet)", -%%% telephone = "(+ 613) 9479-3736", -%%% FAX = "(+ 613) 9479-3025", +%%% version = "6.7b", +%%% date = "4 December 2022", %%% supported = "yes", %%% archived = "CTAN", %%% keywords = "LaTeX package, line spacing", %%% codetable = "ISO/ASCII", -%%% checksum = "11793 546 2608 21972", %%% docstring = "setspace.sty is a LaTeX (2e) package. %%% Comments and bug reports welcome! %%% @@ -204,12 +194,9 @@ %%% requested package options for the three %%% common spacings. %%% -%%% The checksum field above contains a CRC-16 -%%% checksum as the first value, followed by the -%%% equivalent of the standard UNIX wc (word -%%% count) utility output of lines, words, and -%%% characters. This is produced by Robert -%%% Solovay's checksum utility." +%%% DPC Guard against \@ptsize not being defined +%%% https://github.com/rf-latex/setspace/issues/5 +%%% %%% } %%% ====================================================================== %% FILE: setspace.sty in SYS2.TEX.PUB.ISULATEX.STYLES @@ -287,12 +274,12 @@ \@ifundefined{NeedsTeXFormat}{% 2.09 version \def \filename {setspace.sty} -\def \filedate {2000/12/01} -\def \fileversion {6.7a} +\def \filedate {2022/12/04} +\def \fileversion {6.7b} \typeout {Package: `setspace' \fileversion\space <\filedate>} }{% 2e version \NeedsTeXFormat {LaTeX2e}[1994/12/01] -\ProvidesPackage {setspace}[2011/12/19 v6.7a set line spacing] +\ProvidesPackage {setspace}[2022/12/04 v6.7b set line spacing] } % BP: add nodisplayskipstretch option and \setdisplayskipstretch command. @@ -349,6 +336,8 @@ \newcommand{\onehalfspacing}{% \setstretch{1.25}% default +% DPC 6.7b guard \@ptsize + \ifx\@ptsize\@undefined\else \ifcase \@ptsize \relax % 10pt \setstretch {1.25}% \or % 11pt @@ -356,10 +345,13 @@ \or % 12pt \setstretch {1.241}% \fi + \fi } \newcommand{\doublespacing}{% \setstretch {1.667}% default +% DPC 6.7b guard \@ptsize + \ifx\@ptsize\@undefined\else \ifcase \@ptsize \relax % 10pt \setstretch {1.667}% \or % 11pt @@ -367,6 +359,7 @@ \or % 12pt \setstretch {1.655}% \fi + \fi } % ** Modification of the LaTeX command \@setsize. @@ -431,7 +424,7 @@ % GT: Wed 24 Jan 1996: This footnote code was copied from LaTeX and % modified rather naively. It had to be brought up to date, not only -% because of LaTeX's new color ability, but also because ther had +% because of LaTeX's new color ability, but also because there had % been major changes to this code in LaTeX at least as far back as % March 1992. @@ -456,12 +449,16 @@ \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore +% DPC 6.7b added from latex.ltx + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% +% DPC 6.7b added from latex.ltx + \par \color@endgroup}} % Minipage footnotes. @@ -474,11 +471,15 @@ \reset@font\footnotesize \hsize\columnwidth \@parboxrestore +% DPC 6.7b added from latex.ltx + \def\@currentcounter{mpfootnote}% \protected@edef\@currentlabel{% \csname p@mpfootnote\endcsname\@thefnmark}% \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% +% DPC 6.7b added from latex.ltx + \par \color@endgroup}} % ** Line space environments. -- cgit v1.2.3