diff --git a/History.txt b/History.txt index 5e9acd0..b4f971b 100644 --- a/History.txt +++ b/History.txt @@ -1,3 +1,15 @@ +== 1.1.0 / 2007-10-18 + +* To add some missing environments and commands: + * sidenote + * marginnote (no mark) + * marginfigure/table + * text-width figure/table (figure/table) + * page-width figure/table (figure*/table*) + * page-width environment (for custom minipage displays) +* To namespace raggedright +* To add margin font hook + == 1.0.1 / 2007-09-24 * To correct README instructions. diff --git a/README.txt b/README.txt index ee6ffc9..340cb35 100644 --- a/README.txt +++ b/README.txt @@ -30,8 +30,8 @@ or search the news:comp.text.tex group via, == Bugs/Features/Support -For kudos, feature requests, or support requests that you -feel are /particular to this Tufte LaTeX package/, i.e., not +For kudos, feature requests, patches, or support requests that you +feel are /particular/ to this Tufte LaTeX package, i.e., not a general LaTeX issue, please use this project's issue tracker available at @@ -39,9 +39,8 @@ available at == Contributing -Patches are welcome via the issue tracker. Alternatively, -if you'd like to become a developer on this project, email -Bil.Kleb at NASA gov. +Patches are most welcome via the issue tracker! Submit a series of +high quality patches, and we'll add you as a developer on this project. == License diff --git a/sample-handout.pdf b/sample-handout.pdf index d4259ea..1f71b33 100644 Binary files a/sample-handout.pdf and b/sample-handout.pdf differ diff --git a/sample-handout.tex b/sample-handout.tex index 0e5d8be..a080992 100644 --- a/sample-handout.tex +++ b/sample-handout.tex @@ -6,6 +6,7 @@ \usepackage{amsmath} \usepackage{graphicx} + \setkeys{Gin}{width=\linewidth,totalheight=\textheight,keepaspectratio} \graphicspath{{graphics/}} \pagestyle{empty} @@ -14,7 +15,7 @@ \maketitle -\newthought{The} Beckhard-Harris-Gleicher model of change% +\newthought{The Beckhard-Harris-Gleicher} change model% \sidenote{R. Beckhard and R. Harris, {\it Organizational Transitions}, Addison-Wesley, 1987.} states successful change will happen if and only if the product of the @@ -33,7 +34,7 @@ If any factor is low, the chance for successful change is slim, no matter how compelling the other factors might appear. Similarly, if the cost is high, change is not worth pursuing. -\newthought{Satir's} model of well managed change% +\newthought{Satir's model} of well-managed change% \sidenote{Virginia M. Satir, John Banmen, Jane Gerber, and Maria Gomori {\it The Satir Model: Family Therapy and Beyond}, Science and Behavior Books, 1991.\\ @@ -42,12 +43,12 @@ Similarly, if the cost is high, change is not worth pursuing. emphasizes all change entails phases of loss and chaos that, if unanticipated, will cause a retreat to the original status quo. A change agent initiates the descent into chaos and then a transforming -idea marks the beginning of the ascent to the new status quo.\\[5pt] +idea marks the beginning of the ascent to the new status quo. \marginnote{Five stage Satir change model diagram \textcopyright\ stevenmsmith.com.} -\includegraphics[scale=0.5]{satir_graph} +\includegraphics{satir_graph} -\newthought{The} Bateson Double Bind% +\newthought{The Bateson Double Bind}% \sidenote{Gregory Bateson, D. D. Jackson, J. Haley, and J. H. Weakland, ``Toward a Theory of Schizophrenia'', {\it Behavioral Science}, Volume 1, pages~251--264, 1956.\\ @@ -94,10 +95,13 @@ NASA's current vision, mission, and goals slides have recently been cited% \sidenote{Edward R. Tufte, {\it The Cognitive Style of PowerPoint}, 2nd ed., Graphics Press, 2003, page~4.} -as embarrassing examples of what not to do:\\[5pt] +as embarrassing examples of what not to do: +\vfill \begin{center} -\includegraphics{nasa_vision_sm} + \includegraphics[width=0.5\linewidth]{nasa_vision_sm} \end{center} +\vfill +\newpage \newthought{Stop} using PowerPoint bullet list slides for strategic planning, technical communication, or anything but a marketing pitch. diff --git a/tufte-handout.cls b/tufte-handout.cls index 202507a..dc083c5 100644 --- a/tufte-handout.cls +++ b/tufte-handout.cls @@ -1,17 +1,61 @@ \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesClass{tufte-handout}[2007/09/24 v1.0.1 Tufte-handout class] + +\ProvidesClass{tufte-handout}[2007/10/18 v1.1.0 Tufte-handout class] + \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}% \typeout{NOTE: Passing ``\CurrentOption" option on to the standard LaTeX book class}} \ProcessOptions + \LoadClass[11pt]{article}% - \RequirePackage[includemp,letterpaper,width=6.5in,marginparwidth=2in]{geometry} - \RequirePackage{paralist} - \setlength\marginparsep{0.375in} - \setlength\marginparpush{\baselineskip} - \setlength\abovedisplayskip{6pt plus 2pt minus 4pt} - \setlength\belowdisplayskip{6pt plus 2pt minus 4pt} +%% +% Set page layout geometry -- someone please submit a patch to make letterpaper optional! + +\RequirePackage[letterpaper,includemp,width=6.5in,marginparsep=0.375in,marginparwidth=2in]{geometry} + +%% +% Separation marginpars by a line's worth of space. + +\setlength\marginparpush{\baselineskip} + +%% +% Font for margin items + +\newcommand{\@tufteh@marginfont}{\normalfont\scriptsize\sffamily} + +%% +% Modify \raggedright from latex.ltx to allow hyphenation per Donald Arseneau + +\def\@tufteh@raggedright{% + \let\\\@centercr\@rightskip\z@ plus 0.08\hsize% changed this line + \rightskip\@rightskip + \leftskip\z@skip} + +%% +% Turn off section numbering + +\setcounter{secnumdepth}{-1} + +%% +% Tighten up space between displays (e.g., a figure or table) and make symmetric + +\setlength\abovedisplayskip{6pt plus 2pt minus 4pt} +\setlength\belowdisplayskip{6pt plus 2pt minus 4pt} + +%% +% To accomodate full-width display environments + +\RequirePackage{chngpage} + +% Compute length used for full-width displays + +\newlength{\@tufteh@overhang} +\setlength{\@tufteh@overhang}{\marginparwidth} +\addtolength{\@tufteh@overhang}{\marginparsep} + +%% +% Alter \maketitle from article.cls \renewcommand\maketitle{\par \global\let\and\relax @@ -22,7 +66,7 @@ \hb@xt@1.8em{% \hss\@textsuperscript{\normalfont\@thefnmark}}##1}% \newpage - \global\@topnum\z@ % Prevents figures from going at top of page. + \global\@topnum\z@ \@maketitle \@thanks \endgroup @@ -47,12 +91,24 @@ {\small \@author\par} } -% modify abstract section behavior - \renewenvironment{abstract}% - {\footnotesize\quotation\sffamily\slshape}% - {\normalfont\endquotation\normalsize} +%% +% Abstract + +\renewenvironment{abstract}% + {\begin{quotation} + \begin{sffamily} + \begin{small}}% + { \end{small} + \end{sffamily} + \end{quotation}} + +%% +% Require paralist package for tigher lists + +\RequirePackage{paralist} + +% Add rightmargin to compactenum -% modify paralist compact enumeration list to add rightmargin \def\@compactenum@{% \expandafter\list\csname label\@enumctr\endcsname{% \usecounter{\@enumctr}% @@ -63,21 +119,77 @@ \partopsep\plpartopsep \def\makelabel##1{\hss\llap{##1}}}} -% modify \raggedright from latex.ltx to allow hyphenation per Donald Arseneau -\def\raggedright{% - \let\\\@centercr\@rightskip\z@ plus .3\hsize% changed this line - \rightskip\@rightskip - \leftskip\z@skip - \parindent\z@} +%% +% An environment for paragraph-style section \providecommand\newthought[1]{\vspace{1.8\baselineskip plus 3pt minus 2pt}% {\noindent\scshape #1}} -\providecommand\sidenote[1]{\footnotemark% - \marginpar{\textsuperscript{\thefootnote}\footnotesize\raggedright #1}} +%% +% Sidenote: "Where God meant footnotes to go." --Tufte + +\newcommand{\sidenote}[2][-0.8\baselineskip]% + {\footnotemark% + \marginpar{\@tufteh@marginfont + \vspace*{#1} + \textsuperscript{\thefootnote}% + \@tufteh@raggedright #2}} + +%% +% Sidenote without the footnote mark \providecommand\marginnote[1]{\marginpar{\footnotesize\raggedright #1}} -\AtBeginDocument{\raggedright\setlength\parindent{1em}} +%% +% Margin figure + +\newcommand{\marginfigure}[2][-1.2ex]% + {\marginpar{\def\@captype{figure} + \normalfont\scriptsize + \vspace*{#1} + \@tufteh@raggedright #2}} + +%% +% Margin table + +\newcommand{\margintable}[2][-1.2ex]% + {\marginpar{\def\@captype{table} + \normalfont\scriptsize + \vspace*{#1} + \@tufteh@raggedright #2}} + +%% +% Full-width figure + +\renewenvironment{figure*}[1][htbp] + {\@float{figure}[#1] + \begin{adjustwidth}{}{-\tufteh@overhang}% + \begin{minipage}{\linewidth}} + { \end{minipage}% + \end{adjustwidth}% + \end@float} + +%% +% Full-width table + +\renewenvironment{table*}[1][htbp] + {\@float{table}[#1] + \begin{adjustwidth}{}{-\tufteh@overhang}% + \begin{minipage}{\linewidth}} + { \end{minipage}% + \end{adjustwidth}% + \end@float} + +%% +% Full-page-width area + +\newenvironment{fullwidth} + {\begin{adjustwidth}{}{-\tufteh@overhang}}% + {\end{adjustwidth}} + +%% +% Set raggedright and paragraph indentation for document + +\AtBeginDocument{\@tufteh@raggedright\setlength\parindent{1em}} \endinput