From 28143e7004b7ca44aa714faba7e3554d4f2b378d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 10 Apr 2013 22:45:11 +0000 Subject: savetrees (10apr13) git-svn-id: svn://tug.org/texlive/trunk@29841 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/savetrees/savetrees.sty | 69 +++++++++++++++++++--- 1 file changed, 62 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/savetrees/savetrees.sty b/Master/texmf-dist/tex/latex/savetrees/savetrees.sty index f68ae9d79aa..e81721393aa 100644 --- a/Master/texmf-dist/tex/latex/savetrees/savetrees.sty +++ b/Master/texmf-dist/tex/latex/savetrees/savetrees.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2011 by Scott Pakin +%% Copyright (C) 2013 by Scott Pakin %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license @@ -22,10 +22,10 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{savetrees} - [2011/05/14 v2.0 Pack as much text as possible onto each page] + [2013/04/09 v2.1 Pack as much text as possible onto each page] \newcommand*{\st@margin@width}{1.5cm} \newcommand*{\st@parindent}{1em} -\newcommand*{\st@baselinestretch}{0.9} +\newcommand*{\st@baselinestretch}{0.95} \newcommand*{\st@char@shrink}{50} \newcommand*{\st@cspace@shrink}{-25} \newcommand*{\st@wspace@factor}{0.8} @@ -65,6 +65,8 @@ \st@define@option{wordspacing} \st@define@option{bibliography} \st@define@option{bibnotes} +\st@define@option{mathspacing} +\st@define@option{mathdisplays} \define@choicekey{savetrees}{all}[\st@arg\st@arg@num]{tight,normal}[tight]{% \ifnum\st@arg@num=0 \@st@tight@sectionstrue @@ -80,6 +82,8 @@ \@st@tight@wordspacingtrue \@st@tight@bibliographytrue \@st@tight@bibnotestrue + \@st@tight@mathspacingtrue + \@st@tight@mathdisplaystrue \else \@st@tight@sectionsfalse \@st@tight@marginsfalse @@ -94,9 +98,37 @@ \@st@tight@wordspacingfalse \@st@tight@bibliographyfalse \@st@tight@bibnotesfalse + \@st@tight@mathspacingfalse + \@st@tight@mathdisplaysfalse \fi } \DeclareOptionX{all}[tight]{\KV@savetrees@all{#1}} +\define@key{savetrees}{subtle}{% + \setkeys{savetrees}{% + all=normal, + paragraphs=tight, + floats=tight, + mathspacing=tight, + wordspacing=tight, + tracking=tight + }% +} +\DeclareOptionX{subtle}{\KV@savetrees@subtle} +\define@key{savetrees}{moderate}{% + \setkeys{savetrees}{% + subtle=yes, + charwidths=tight, + mathdisplays=tight, + lists=tight, + indent=tight, + leading=tight, + bibnotes=tight + }% +} +\DeclareOptionX{moderate}{\KV@savetrees@moderate} +\DeclareOptionX{extreme}{% + \setkeys{savetrees}{all=tight}% +} \DeclareOptionX{marginwidth}{\gdef\st@margin@width{#1}} \DeclareOptionX{parindent}{\gdef\st@parindent{#1}} \DeclareOptionX{leadingfraction}{\gdef\st@baselinestretch{#1}} @@ -164,7 +196,8 @@ {\def\makelabel##1{\hss\llap{##1}}% \settowidth{\leftmargin}{\csname\@itemitem\endcsname}% \addtolength{\leftmargin}{\labelsep * \@itemdepth}% - \setlength{\topsep}{4pt plus 1pt minus 2pt}% + \setlength{\partopsep}{0pt plus 4pt}% + \setlength{\topsep}{0pt plus 4pt}% \setlength{\itemsep}{0pt}% \setlength{\parsep}{0pt}% \setlength{\listparindent}{\st@parindent}% @@ -180,15 +213,22 @@ {\usecounter\@enumctr\def\makelabel##1{\hss\llap{##1}}% \settowidth{\leftmargin}{\csname label\@enumctr\endcsname}% \addtolength{\leftmargin}{\labelsep * \@enumdepth}% - \setlength{\topsep}{4pt plus 1pt minus 2pt}% + \setlength{\partopsep}{0pt plus 4pt}% + \setlength{\topsep}{0pt plus 4pt}% \setlength{\itemsep}{0pt}% \setlength{\parsep}{0pt}% \setlength{\listparindent}{\st@parindent}% } \fi} \renewenvironment{description}{% - \begin{list}{}{\setlength{\leftmargin}{1em}% - \labelwidth\z@ \itemindent-\leftmargin + \begin{list}{}{\setlength{\leftmargin}{1pc}% + \setlength{\itemindent}{-\leftmargin}% + \setlength{\partopsep}{0pt plus 4pt}% + \setlength{\topsep}{0pt plus 4pt}% + \setlength{\itemsep}{0pt}% + \setlength{\parsep}{0pt}% + \setlength{\labelwidth}{0pt}% + \setlength{\listparindent}{\st@parindent}% \let\makelabel\descriptionlabel}% }{% \end{list} @@ -284,6 +324,21 @@ \else \newcommand{\savetreesbibnote}[1]{#1} \fi +\if@st@tight@mathspacing + \AtBeginDocument{% + \thinmuskip=0mu plus 3mu + \medmuskip=1mu plus 4mu + \thickmuskip=2mu plus 5mu + } +\fi +\if@st@tight@mathdisplays + \AtBeginDocument{% + \abovedisplayskip=0pt plus 3pt + \belowdisplayskip=0pt plus 3pt + \abovedisplayshortskip=0pt plus 3pt + \belowdisplayshortskip=0pt plus 3pt + } +\fi \endinput %% %% End of file `savetrees.sty'. -- cgit v1.2.3