From 36507098ab9c39ef18545302af29295ecc153f8c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 20 Dec 2011 01:23:12 +0000 Subject: setspace (19dec11) git-svn-id: svn://tug.org/texlive/trunk@24881 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/setspace/README | 13 +++++++ .../doc/latex/setspace/setspace-test.tex | 24 +++++++++++++ Master/texmf-dist/tex/latex/setspace/setspace.sty | 42 ++++++++++++++++++---- 3 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/setspace/README create mode 100644 Master/texmf-dist/doc/latex/setspace/setspace-test.tex diff --git a/Master/texmf-dist/doc/latex/setspace/README b/Master/texmf-dist/doc/latex/setspace/README new file mode 100644 index 00000000000..08b35258693 --- /dev/null +++ b/Master/texmf-dist/doc/latex/setspace/README @@ -0,0 +1,13 @@ +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/setspace-test.tex b/Master/texmf-dist/doc/latex/setspace/setspace-test.tex new file mode 100644 index 00000000000..55ccbf216fa --- /dev/null +++ b/Master/texmf-dist/doc/latex/setspace/setspace-test.tex @@ -0,0 +1,24 @@ +\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 b4d04e1f2a4..aa97a31ef4f 100644 --- a/Master/texmf-dist/tex/latex/setspace/setspace.sty +++ b/Master/texmf-dist/tex/latex/setspace/setspace.sty @@ -1,8 +1,29 @@ -% You may freely use, modify, and/or distribute this file, without limitation. +% \iffalse meta-comment +% +% Copyright (C) 2011 by Robin Fairbairns (rf10@cam.ac.uk) +% Copyright (C) 2000 by Geoffrey Tobin +% +% --------------------------------------------------------------------------- +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Robin Fairbairns +% +% This work consists of the files setspace.sty and setspace-test.tex +% +% \fi +% %%% ====================================================================== %%% @LaTeX-style-file{ %%% filename = "setspace.sty", -%%% version = "6.7", +%%% version = "6.7a", %%% date = "Fri 1 December 2000", %%% time = "17:49 UT+11", %%% author = "Geoffrey Tobin", @@ -264,13 +285,15 @@ %% the quote (extra glue is inserted). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\NeedsTeXFormat {LaTeX2e}[1994/12/01] +\@ifundefined{NeedsTeXFormat}{% 2.09 version \def \filename {setspace.sty} \def \filedate {2000/12/01} -\def \fileversion {6.7} -\ProvidesPackage {setspace}[\filedate\space\fileversion\space - Contributed and Supported LaTeX2e package] +\def \fileversion {6.7a} \typeout {Package: `setspace' \fileversion\space <\filedate>} +}{% 2e version +\NeedsTeXFormat {LaTeX2e}[1994/12/01] +\ProvidesPackage {setspace}[2011/12/19 v6.7a set line spacing] +} % BP: add nodisplayskipstretch option and \setdisplayskipstretch command. @@ -364,6 +387,10 @@ % place in purely modern LaTeX where \@currsize is set, and ltxguide.cls % seems to be the only file in the LaTeX base distribution that uses it! +% RF: 2011-12-19: only redefine \@setsize if under 2e; there have been +% reports of ltx209 packages failing when run with setspace under +% ltx2e, with this definition +\@ifundefined{NeedsTeXFormat}{% \def\@setsize#1#2#3#4{% % Modified 1993.04.07--GDG per KPC \@nomath#1% @@ -376,7 +403,8 @@ depth.3\baselineskip width\z@}% \skip\footins \baselinestretch\skip\footins - \normalbaselineskip\baselineskip#3#4} + \normalbaselineskip\baselineskip#3#4}% +}{}% % ** Float and footnote adjustments to compensate for a change in the % ** main text's line spacing. -- cgit v1.2.3