From 73849e199eb04846d8a0381ee647964c65dd635a Mon Sep 17 00:00:00 2001
From: "Kevin M. Godby" <godbyk@gmail.com>
Date: Fri, 10 Apr 2009 16:43:28 +0000
Subject: [PATCH] * Fixes issue 19: The latest version of the caption package
 issued a warning   about our marginfigures and margintables.  Thanks, for the
 patch,  Andy! * Addresses issue 22: Andy reported that some whitespace was
 introduced by the   current \maketitlepage command.  Will have Andy confirm.

git-svn-id: https://tufte-latex.googlecode.com/svn/trunk@84 516e2f36-ce3a-0410-bea4-1d4a03f5df72
---
 sample-book.pdf    | Bin 122071 -> 122072 bytes
 sample-handout.pdf | Bin 126285 -> 126285 bytes
 tufte-common.sty   |  84 +++++++++++++++++++++------------------------
 3 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/sample-book.pdf b/sample-book.pdf
index 07b28ed1e97ba8703bc2c8cbb6dffe217286aa4b..fd0d19a15add0ca0f4ff71e7fdf6c27e80d9c342 100644
GIT binary patch
delta 3969
zcmai1O=z5D5azQ@6C+loRuFp#NUQ~snRn*>t8E}nv-Y3{ia&U$Bt%mM5t~-fLjBbA
zphAlfbP*L5e_AiqLz>ziil!<`j3TM6q7(#C3SO)VrBZb^$?j%n0_L)0cIKU#XJ($6
zJ$<zOyQA$NoLf=E@u8k|<7?Vim3z)_;cNDN_90#Pw;Vk1mLKMCzI}S=shzzaUw-w;
z=Ppzp+OYDf$F_cQ|DD&i?Y`;oYw6j0I_}<oc<haHhnD|-$pIdjy79%Z*R48pZ2OK|
z4|eQ$u(xCCdAN9T^rI6GuOI$&<0~5{-@o*_$;s}C@AJ*aH~;p>z1QFV`LbVT_iT8x
z?}bylJNwhcxOMu}{@W(r-qJSv<lq;Z&z{})=b4`m-Z1g%^2?@PzT<Qr{Q=&4W}Dw0
zX8xWXeD|*_SG;q6;P~Y5uUAYByo5)W{qyJ(W8*)ytr~0VIMUWp+;yTI0g*CSho*})
z^?#1+oi4hI)wv65e_fAsb=E!+eE_T;|FXDcwKHFNm#Qmgiq{KQJv37cuj5t?0Ov3m
z8F;F$|EgG9qW+2)%@dT^JV7pjwskI9y_l5`L<UFmw)ZuYWX#I30OY|w7+}G8ku3#d
z%br5D=j&o^k*Xu|Q6?QOCsa@au#4&?0LuDx(TiYhqt=rQLR`=*>)`@;j9v%h0abCu
zNk)}w&DI&*eFT%7_uT5ElveT%TZJ`Q@XCo4C^-{M5Ni{3N(KcVvkfrkSZd=Gz&x1H
zc3OaJ^_(|lN@PotDAbcH7sd%7alQSTB}ts>icLMwT87|R2ZKQM8ZUa!l%xa%PEnzN
zj!DCX&IO|f!Rd_Ak?A93r{@ij(WS0h{hOpB-6ox+gAri#yrEA)_Y6wISzC$*EuXNF
zTv=x`&SZ>(GquA2rWep>Hpm1ty?}|#XqPC#nCt{q-NBfgp+E=TbiV^idh9T<8CfTD
zEPm(kZ#0N=z9wubiE}J<QZfhz1+gU^v}51s^m+qJYvpF?%DH7C>!86%&0yH_tP9>i
z=z<Wk4v?1!P(-T4h@}VC9qf{<Fa2O5Z?X%PD_r8JHVcqItpg+=SJSKE-^@4#T*8=i
z2b1%l8;%^24w}H5?kB0qqG0Cdk0?h44ajqPrAf@*W<uG}H?g=;2+9ig&AQK*ow$@1
zHj0*LD0nl96oli9t!Qdlu=_;_cs@YMzX87plQm{N+j99}Fl9=f4gAScFon?4TXXo!
zC1dE3h0`^JESzovOo4PTyac7Q^o&MJh_xi^B$zp7$7bGHP8r>V%oH>V;@I3@%)D@?
zl}-3%WDUc~#Hxcq?hlsYsTzyOn_!}JoYsrjdK=X67suHe6Bt+{d6k{?f{R8*vQv#?
z-&{KLJ4ddy<jkonLUY2(6=0#31*oZ-lO1DWd5c1B+?dV#PYzg_g;t&qvfqu2oYPDg
zNW#{(F`6Y75~#@${G$M&;ffHAlPEWwu4j}pOb3%An2fW;qR>Kg@}j!`q@JV+No1^d
zxyXX1R*|K})LMfQ<zBG1!8Jy<e*cLg=}biCgNa)FsyP<DWPhcEtj7*fejcdzHi-~5
z_lr!}qP3ninLaE;CL>l2KNh`%sj?}D-u`~s&@okf>h%@${VC+W3=k@PJzX3AS7lpQ
dPfzF0T|=Y09v^*Rq*I=ktG%<kyMLh4`5yxUJpTXy

delta 3963
zcmai1TWFkB5aw4*>Q<~Z$%9(LR!GxU#5rfq)tH!OlYpQV9}0nz)ELt!g3=hY=)<p7
zu^^G^N*6_tq9lr!rd}v{5Gj3#TB}uK4ceE25A}jKEO{x``8V0@?o7bsVPW>nnVE0C
z`OfUZY~%N{jWd5Y6w^z#7B@6DrSG19VSe+qlY7Sgxp=XA`gJ=pzwq6Y!%sZkeXOPV
z_NMcb-|XFR{nTyii`zz<&mEe7<fr^lejv_Yx$pBo+V+oyDb>{f)`y#3dil@OozLy;
z>DxcJw&$vYPyaQ2u(Ngdx0m1W`@(NWKHm7w!Vj;^e71ehztiKtJ}_xEt~>Yk&cQ>4
z1E(Lmy0>+4$C;UrE?qnH;yuSq>%fI8w(lBwV{y~mn>{D)n#sR9JNM}G@4q+j>Au0v
zk)MBAoG#2w6^|ddFum)?BOg55eNFMY_4lPC#j}?+J=L)0Xv3Oh$MLNYl{Z1h8^N{%
zv~S7XbjL&Y_6|>s<~R4=tN|jJ<s(O*Igzv_Eg=utU;e>-F8fr<I)KtAUnCtZN_=It
zFReS7yq2ia;giY87OX!3ptZ8X23D6kzD(Lv;9sFp;tC8#T!Gq0?yGf>=X_)_lrogm
zlJ8KpNTVVPtQ1<17dlvWuJJ`De2qn0y7jB1J@KV6`ba%b*966&1~A&Qn*cEK+v%JK
z>FfD9s=)c>b7>`A08516$yn+$x0$F|shO`5xLXgRIBQLPjQfd7R;zkrW^<MWp#}vl
zl5rH8Cul<uC|F-Qdn##4V|4s@a3HP-N^;B5JP2QHMPmZWCIocla%^>g0D`FyuG)k^
zMT#J$Q(q^|sWm*j0<840<^~D70uy-IN*m2vrnGkA95`JrF|A2mX%t*hbRU~3P)2Fa
z0i}s7tVHrfK2pjCS4#_uPpU(tlFsNkX5<X4I^s`6;p?<$mU1APuWU?>fW|4&eHBoQ
zuL?>ChH~0)k}BdiXOjlIOmGs#W$6VC7zC_=ux7AoFp<NmwOz$V0wa7~Jqj8A<cvIP
zZR`@aYxtoJ#@gOxts`y;vXZYrMmsAI)DBI``U%>w46`84IM!o&sK5wV1HDkZ;(%5Z
z=T^j_s+2mA&N64D5#tFWpyuavaEjZ=7kTSYTd3z7;g1@TXN_P5`%xPslELU1GJqKP
zt3@%aECi!6DX*B4=CIN;ZF%3(z$!K=H0Z1tMI^8)$fOnaqrp01$jC+VD&7!!ePx1<
zwgz5^Gkmm(Go%9b=TaIvYXtm3N-#Pn$VFj=I%dFd1Pw{LNH92rd|Cgh8emq@bVH=6
zz*Rwuloe$Vf}y@TS}{!hyc4Qq!4(pwOM4#~X?qaPR_s{D7_p1d#0rHoq=dX;YKV|(
z(qFVI*;JD8M)ciyCEkAuEFOO2kt8c)PYtRbEh~<=pgq~j_*W#DRw#OWg|p?44sB#X
zXaLzHG6AblSBeYHR^>Y_uicr<h&iU(BnnaPk+h>mt_u#FSlwuFH0Os)(PS{x!R0*t
zhTygUe00DQ4je67Q$!GNy?8e~?Oj=n4F3xJ5NQqIq={a<c8b;y&Kc?_azP>+QN6wp
zvbkDiE%%>{G|2oQEuq4hwkAd{r5u(ksVRhPwCRfbJbw@9TpHvr5f}N`DdmB`?_{HY
z9>i-|2z7+Dn0%KftkiKP>AbtIuSfUv_Xn+^7Yd#vjGpyEKRrTzTcKbIUHM!7_sC$r
ct1I{L#PImU-tp1hISS!J%(b=k-Pxb}4^CP^UH||9

diff --git a/sample-handout.pdf b/sample-handout.pdf
index 08d5f88802c9914c5cff11589c41f3d87ba2b299..6762508085557e3878967debfafc80d200d926f6 100644
GIT binary patch
delta 133
zcmX?mi~Z~^_J%EtJ@>Q?4Gay9Eln(R4NTPy4AeEb^nLSFToOxC6*OF|j0_Ac4NPE4
zwr{`3XvXJcU}j=s>SkeX=wjw<?q=xdXklz<X=LbT>ga0jXzpZSr(i=s$#ng<jB)_d
CM<W3M

delta 133
zcmX?mi~Z~^_J%EtJ@>Q?EDg;~ER4)`4NTPy4AeEb^nLSFToOxC6*OF|j0_Ac4NPE4
zwr{`3XvXJc;b`h;;Ogw^YG!KS>SSzcU~FV!>11hc?&@M;Y~gHRr(i=s$#ng<jB)_x
Czav2a

diff --git a/tufte-common.sty b/tufte-common.sty
index 26bdc92..a989852 100644
--- a/tufte-common.sty
+++ b/tufte-common.sty
@@ -698,37 +698,37 @@
 % Margin figure environment
 
 \newsavebox{\@tufte@marginfigbox}
-\newenvironment{marginfigure}[1]
-    [-1.2ex]
-    {\FloatBarrier% process all floats before this point so the figure numbers stay in order.
-    \begin{lrbox}{\@tufte@marginfigbox}
-    \begin{minipage}{\marginparwidth}
-        \@tufte@marginfont
-        \def\@captype{figure}
-        \vspace*{#1}
-        \@tufte@justification
-    }    
-    {\end{minipage}%
-     \end{lrbox}%
-     \marginpar{\usebox{\@tufte@marginfigbox}}}
+\newenvironment{marginfigure}[1][-1.2ex]
+  {\FloatBarrier% process all floats before this point so the figure numbers stay in order.
+  \begin{lrbox}{\@tufte@marginfigbox}%
+  \begin{minipage}{\marginparwidth}%
+    \captionsetup{type=figure}%
+    \@tufte@marginfont%
+    \def\@captype{figure}%
+    \vspace*{#1}%
+    \@tufte@justification%
+  }    
+  {\end{minipage}%
+  \end{lrbox}%
+  \marginpar{\usebox{\@tufte@marginfigbox}}}
 
 
 %%
 % Margin table environment
 \newsavebox{\@tufte@margintablebox}
-\newenvironment{margintable}[1]
-   [-1.2ex]
-   {\FloatBarrier% process all floats before this point so the figure numbers stay in order.
-   \begin{lrbox}{\@tufte@margintablebox}
-   \begin{minipage}{\marginparwidth}
-       \@tufte@marginfont
-       \def\@captype{table}
-       \vspace*{#1}
-       \@tufte@justification
-   }
-   {\end{minipage}%
-    \end{lrbox}%
-    \marginpar{\usebox{\@tufte@margintablebox}}}
+\newenvironment{margintable}[1][-1.2ex]
+  {\FloatBarrier% process all floats before this point so the figure numbers stay in order.
+   \begin{lrbox}{\@tufte@margintablebox}%
+   \begin{minipage}{\marginparwidth}%
+     \captionsetup{type=table}%
+     \@tufte@marginfont%
+     \def\@captype{table}%
+     \vspace*{#1}%
+     \@tufte@justification%
+  }
+  {\end{minipage}%
+   \end{lrbox}%
+   \marginpar{\usebox{\@tufte@margintablebox}}}
 
 
 %%
@@ -767,7 +767,7 @@
 \newenvironment{fullwidth}
   {\ifthenelse{\boolean{@tufte@symmetric}}
      {\ifthenelse{\boolean{@tufte@changepage}}{\begin{adjustwidth*}{}{-\@tufte@overhang}}{\begin{adjustwidth}[]{}{-\@tufte@overhang}}}
-     {\begin{adjustwidth}{}{-\@tufte@overhang}}
+     {\begin{adjustwidth}{}{-\@tufte@overhang}}%
   }
   {\end{adjustwidth}}
 
@@ -920,25 +920,19 @@
 % Produces a full title page
 
 \newcommand{\maketitlepage}[0]{%
-  \cleardoublepage
-  {
-  \sffamily
-  \begin{fullwidth}
-  \par\noindent\fontsize{18}{18}\selectfont\textcolor{darkgray}{\allcaps{\thanklessauthor}}
-  \end{fullwidth}
-
-  \vspace{11.5pc}
-  \begin{fullwidth}
-  \par\noindent\fontsize{36}{36}\selectfont\textcolor{darkgray}{\allcaps{\thanklesstitle}}
-  \end{fullwidth}
-
-  \vfill
-  \begin{fullwidth}
-  \par\noindent\fontsize{14}{14}\selectfont\allcaps{\thanklesspublisher}
-  \end{fullwidth}
+  \cleardoublepage%
+  {%
+  \sffamily%
+  \begin{fullwidth}%
+  \fontsize{18}{20}\selectfont\par\noindent\textcolor{darkgray}{\allcaps{\thanklessauthor}}%
+  \vspace{11.5pc}%
+  \fontsize{36}{40}\selectfont\par\noindent\textcolor{darkgray}{\allcaps{\thanklesstitle}}%
+  \vfill%
+  \fontsize{14}{16}\selectfont\par\noindent\allcaps{\thanklesspublisher}%
+  \end{fullwidth}%
   }
-  \thispagestyle{empty}
-  \clearpage
+  \thispagestyle{empty}%
+  \clearpage%
 }
 
 %%