tufte-latex 3.5.0 (11dec09)

git-svn-id: svn://tug.org/texlive/trunk@16378 c570f23f-e606-0410-a88d-b1316a301751

21 files changed, 1307 insertions, 3281 deletions

diff --git a/Master/texmf-dist/doc/latex/tufte-latex/History.txt b/Master/texmf-dist/doc/latex/tufte-latex/History.txt
index 8ef3a00b34a..528493d698c 100644
--- a/Master/texmf-dist/doc/latex/tufte-latex/History.txt
+++ b/Master/texmf-dist/doc/latex/tufte-latex/History.txt
@@ -1,3 +1,20 @@
+== 3.5.0 / 2009-12-11
+* Added a [nohyper] document class option that suppresses loading of the
+  hyperref package.
+* Added three commands to modify the positioning of the captions.
+* Now automatically recalculates the lengths in case you've modified the page
+  size or margins.
+* Added a B5 paper size.
+* The justification of sidenotes, margin notes, captions, and citations can be
+  set individually now.
+* The font and style of sidenotes, margin notes, captions, and citations can
+  now be set individually.
+* The \caption command now accepts an optional vertical offset argument.
+* Added the \morefloats command that works in the same way the morefloats
+  package does.
+* Fixed a number of bugs.
+
+
 == 3.0.0 / 2009-05-17
 * Created a Tufte-book document class.
 * Added optional offset parameter to sienotes, cite, etc. so their vertical
diff --git a/Master/texmf-dist/doc/latex/tufte-latex/Manifest.txt b/Master/texmf-dist/doc/latex/tufte-latex/Manifest.txt
new file mode 100644
index 00000000000..c4c194acede
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tufte-latex/Manifest.txt
@@ -0,0 +1,26 @@
+History.txt
+Manifest.txt
+README.txt
+graphics/nasa_vision_sm.png
+graphics/satir_graph.png
+graphics/helix.asy
+graphics/sine.asy
+graphics/hilbertcurves.pdf
+graphics/helix.pdf
+graphics/sine.pdf
+graphics/be-contents.pdf
+graphics/be-title.pdf
+graphics/ei-contents.pdf
+graphics/ei-title.pdf
+graphics/vdqi-contents.pdf
+graphics/vdqi-title.pdf
+graphics/ve-contents.pdf
+graphics/ve-title.pdf
+sample-handout.bib
+sample-handout.pdf
+sample-handout.tex
+tufte-handout.cls
+sample-book.pdf
+sample-book.tex
+tufte-book.cls
+tufte-common.def
diff --git a/Master/texmf-dist/doc/latex/tufte-latex/README.txt b/Master/texmf-dist/doc/latex/tufte-latex/README
index b06553125e2..99640e6231e 100644
--- a/Master/texmf-dist/doc/latex/tufte-latex/README.txt
+++ b/Master/texmf-dist/doc/latex/tufte-latex/README
@@ -5,7 +5,7 @@ produce Tufte-style handouts, reports, and notes.
 
 == Quick Start
 
-Try typesetting sample.tex with the following sequence
+Try typesetting sample-handout.tex with the following sequence
 of commands,
 
  pdflatex sample-handout
@@ -15,6 +15,17 @@ of commands,
 
 The result should look like sample-handout.pdf.
 
+The sample book can be compiled with the following:
+
+ pdflatex sample-book
+ bibtex sample-book
+ texindy --language english sample-book.idx
+ # or makeindex sample-book.idx
+ pdflatex sample-book
+ pdflatex sample-book
+ pdflatex sample-book
+
+
 == Troubleshooting
 
 If you encounter errors of the form,
@@ -64,7 +75,7 @@ The following packages are optional and will be automatically used if installed:
 == Bugs/Features/Support
 
 For kudos, feature requests, patches, or support requests that you
-feel are /particular/ to this Tufte LaTeX package, i.e. not a general
+feel are /particular/ to this Tufte-LaTeX package, i.e., not a general
 LaTeX issue, please use this project's issue tracker available at
 
  http://tufte-latex.googlecode.com
diff --git a/Master/texmf-dist/doc/latex/tufte-latex/graphics/hilbertrecursive.tex b/Master/texmf-dist/doc/latex/tufte-latex/graphics/hilbertrecursive.tex
deleted file mode 100644
index dc30ec12893..00000000000
--- a/Master/texmf-dist/doc/latex/tufte-latex/graphics/hilbertrecursive.tex
+++ /dev/null
@@ -1,72 +0,0 @@
-% Draw Hilbert curves. 
-% Credits: Based on code by Marc van Dongen
-% See: http://www.fauskes.net/pgftikzexamples/hilbert-curve/
-\title{Hilbert Curves}
-\author{}
-\date{}
-
-\documentclass{tufte-handout}
-
-\usepackage{tikz}
-
-\usepackage[active,tightpage]{preview}
-\PreviewEnvironment{tikzpicture}
-\usetikzlibrary{positioning}
-
-\begin{document}
-
-\newdimen\HilbertLastX
-\newdimen\HilbertLastY
-\newcounter{HilbertOrder}
-
-\def\DrawToNext#1#2{%
-   \advance \HilbertLastX by #1
-   \advance \HilbertLastY by #2
-   \pgfpathlineto{\pgfqpoint{\HilbertLastX}{\HilbertLastY}}
-   % Alternative implementation using plot streams:
-   % \pgfplotstreampoint{\pgfqpoint{\HilbertLastX}{\HilbertLastY}}
-}
-
-% \Hilbert[right_x,right_y,left_x,left_x,up_x,up_y,down_x,down_y]
-\def\Hilbert[#1,#2,#3,#4,#5,#6,#7,#8] {
-  \ifnum\value{HilbertOrder} > 0%
-     \addtocounter{HilbertOrder}{-1}
-     \Hilbert[#5,#6,#7,#8,#1,#2,#3,#4]
-     \DrawToNext {#1} {#2}
-     \Hilbert[#1,#2,#3,#4,#5,#6,#7,#8]
-     \DrawToNext {#5} {#6}
-     \Hilbert[#1,#2,#3,#4,#5,#6,#7,#8]
-     \DrawToNext {#3} {#4}
-     \Hilbert[#7,#8,#5,#6,#3,#4,#1,#2]
-     \addtocounter{HilbertOrder}{1}
-  \fi
-}
-
-
-% \hilbert((x,y),order)
-\def\hilbert((#1,#2),#3){%
-   \advance \HilbertLastX by #1
-   \advance \HilbertLastY by #2
-   \pgfpathmoveto{\pgfqpoint{\HilbertLastX}{\HilbertLastY}}
-   % Alternative implementation using plot streams:
-   % \pgfplothandlerlineto
-   % \pgfplotstreamstart
-   % \pgfplotstreampoint{\pgfqpoint{\HilbertLastX}{\HilbertLastY}}
-   \setcounter{HilbertOrder}{#3}
-   \Hilbert[1mm,0mm,-1mm,0mm,0mm,1mm,0mm,-1mm]
-   \pgfusepath{stroke}%
-}
-
-\def\scalefac{1}
-\maketitle
-
-\begin{figure}[h!]
-\begin{tikzpicture}[node distance=0cm,every path/.style={thin}]
-    \node[label={above:$n=1$}] (n1) {\tikz[scale=\scalefac*18] \hilbert((0mm,0mm),1);};
-    \node[label={above:$n=2$},right=of n1] (n2) {\tikz[scale=\scalefac*6] \hilbert((0mm,0mm),2);};
-    \node[label={above:$n=3$},right=of n2] (n3) {\tikz[scale=\scalefac*2.6] \hilbert((0mm,0mm),3);};
-    \node[label={above:$n=4$},right=of n3] (n4) {\tikz[scale=\scalefac*1.2] \hilbert((0mm,0mm),4);};
-    \node[label={above:$n=5$},right=of n4] (n5) {\tikz[scale=\scalefac*0.58] \hilbert((0mm,0mm),5);};
-\end{tikzpicture}
-\end{figure}
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/tufte-latex/sample-book.pdf b/Master/texmf-dist/doc/latex/tufte-latex/sample-book.pdf
index 09378a26ca4..49f682e0d02 100644
--- a/Master/texmf-dist/doc/latex/tufte-latex/sample-book.pdf
+++ b/Master/texmf-dist/doc/latex/tufte-latex/sample-book.pdf
diff --git a/Master/texmf-dist/doc/latex/tufte-latex/sample-book.tex b/Master/texmf-dist/doc/latex/tufte-latex/sample-book.tex
index eb95dec6311..c22cb2a87cc 100644
--- a/Master/texmf-dist/doc/latex/tufte-latex/sample-book.tex
+++ b/Master/texmf-dist/doc/latex/tufte-latex/sample-book.tex
@@ -1,5 +1,7 @@
 \documentclass{tufte-book}
 
+\hypersetup{colorlinks}% uncomment this line if you prefer colored hyperlinks (e.g., for onscreen viewing)
+
 %%
 % Book metadata
 \title{A Tufte-Style Book\thanks{Thanks to Edward R.~Tufte for his inspiration.}}
@@ -91,28 +93,53 @@
 \newcommand{\measure}[3]{#1/#2$\times$\unit[#3]{pc}}
 
 % Macros for typesetting the documentation
-\newcommand{\hl}[1]{\textcolor{Maroon}{#1}}% prints in red
+\newcommand{\hlred}[1]{\textcolor{Maroon}{#1}}% prints in red
 \newcommand{\hangleft}[1]{\makebox[0pt][r]{#1}}
 \newcommand{\hairsp}{\hspace{1pt}}% hair space
 \newcommand{\hquad}{\hskip0.5em\relax}% half quad space
 \newcommand{\TODO}{\textcolor{red}{\bf TODO!}\xspace}
 \newcommand{\ie}{\textit{i.\hairsp{}e.}\xspace}
 \newcommand{\eg}{\textit{e.\hairsp{}g.}\xspace}
+\newcommand{\na}{\quad--}% used in tables for N/A cells
 \providecommand{\XeLaTeX}{X\lower.5ex\hbox{\kern-0.15em\reflectbox{E}}\kern-0.1em\LaTeX}
 \newcommand{\tXeLaTeX}{\XeLaTeX\index{XeLaTeX@\protect\XeLaTeX}}
 % \index{\texttt{\textbackslash xyz}@\hangleft{\texttt{\textbackslash}}\texttt{xyz}}
 \newcommand{\tuftebs}{\symbol{'134}}% a backslash in tt type in OT1/T1
-\newcommand{\doccmd}[1]{%
-  \texttt{\tuftebs#1}%
-  \index{#1@\protect\hangleft{\texttt{\tuftebs}}\texttt{#1}}%
+\newcommand{\doccmdnoindex}[2][]{\texttt{\tuftebs#2}}% command name -- adds backslash automatically (and doesn't add cmd to the index)
+\newcommand{\doccmddef}[2][]{%
+  \hlred{\texttt{\tuftebs#2}}\label{cmd:#2}%
+  \ifthenelse{\isempty{#1}}%
+    {% add the command to the index
+      \index{#2 command@\protect\hangleft{\texttt{\tuftebs}}\texttt{#2}}% command name
+    }%
+    {% add the command and package to the index
+      \index{#2 command@\protect\hangleft{\texttt{\tuftebs}}\texttt{#2} (\texttt{#1} package)}% command name
+      \index{#1 package@\texttt{#1} package}\index{packages!#1@\texttt{#1}}% package name
+    }%
+}% command name -- adds backslash automatically
+\newcommand{\doccmd}[2][]{%
+  \texttt{\tuftebs#2}%
+  \ifthenelse{\isempty{#1}}%
+    {% add the command to the index
+      \index{#2 command@\protect\hangleft{\texttt{\tuftebs}}\texttt{#2}}% command name
+    }%
+    {% add the command and package to the index
+      \index{#2 command@\protect\hangleft{\texttt{\tuftebs}}\texttt{#2} (\texttt{#1} package)}% command name
+      \index{#1 package@\texttt{#1} package}\index{packages!#1@\texttt{#1}}% package name
+    }%
 }% command name -- adds backslash automatically
 \newcommand{\docopt}[1]{\ensuremath{\langle}\textrm{\textit{#1}}\ensuremath{\rangle}}% optional command argument
 \newcommand{\docarg}[1]{\textrm{\textit{#1}}}% (required) command argument
 \newenvironment{docspec}{\begin{quotation}\ttfamily\parskip0pt\parindent0pt\ignorespaces}{\end{quotation}}% command specification environment
-\newcommand{\docenv}[1]{\texttt{#1}\index{#1@\texttt{#1} environment}\index{environments!#1@\texttt{#1}}}% environment name
-\newcommand{\docpkg}[1]{\texttt{#1}\index{#1@\texttt{#1} package}\index{packages!#1@\texttt{#1}}}% package name
+\newcommand{\docenv}[1]{\texttt{#1}\index{#1 environment@\texttt{#1} environment}\index{environments!#1@\texttt{#1}}}% environment name
+\newcommand{\docenvdef}[1]{\hlred{\texttt{#1}}\label{env:#1}\index{#1 environment@\texttt{#1} environment}\index{environments!#1@\texttt{#1}}}% environment name
+\newcommand{\docpkg}[1]{\texttt{#1}\index{#1 package@\texttt{#1} package}\index{packages!#1@\texttt{#1}}}% package name
 \newcommand{\doccls}[1]{\texttt{#1}}% document class name
-\newcommand{\docclsopt}[1]{\texttt{#1}\index{#1@\texttt{#1} class option}\index{class options!#1@\texttt{#1}}}% document class option name
+\newcommand{\docclsopt}[1]{\texttt{#1}\index{#1 class option@\texttt{#1} class option}\index{class options!#1@\texttt{#1}}}% document class option name
+\newcommand{\docclsoptdef}[1]{\hlred{\texttt{#1}}\label{clsopt:#1}\index{#1 class option@\texttt{#1} class option}\index{class options!#1@\texttt{#1}}}% document class option name defined
+\newcommand{\docmsg}[2]{\bigskip\begin{fullwidth}\noindent\ttfamily#1\end{fullwidth}\medskip\par\noindent#2}
+\newcommand{\docfilehook}[2]{\texttt{#1}\index{file hooks!#2}\index{#1@\texttt{#1}}}
+\newcommand{\doccounter}[1]{\texttt{#1}\index{#1 counter@\texttt{#1} counter}}
 
 % Generates the index
 \usepackage{makeidx}
@@ -140,7 +167,7 @@ The new becomes threatening, the old reassuring.
 A designer knows that he has achieved perfection 
 not when there is nothing left to add, 
 but when there is nothing left to take away.
-}{Antoine de St-Expurey}
+}{Antoine de Saint-Exup\'{e}ry}
 \vfill
 \openepigraph{%
 \ldots the designer of a new system must not only be the implementor and the first 
@@ -184,6 +211,10 @@ under the License.\index{license}
 % r.5 contents
 \tableofcontents
 
+\listoffigures
+
+\listoftables
+
 % r.7 dedication
 \cleardoublepage
 ~\vfill
@@ -204,7 +235,7 @@ and \mbox{Donald E.~Knuth}.
 
 This sample book discusses the design of Edward Tufte's
 books\cite{Tufte2001,Tufte1990,Tufte1997,Tufte2006}
-and the use of the \texttt{tufte-book} and \texttt{sample-handout} document classes.
+and the use of the \doccls{tufte-book} and \doccls{tufte-handout} document classes.
 
 
 %%
@@ -304,14 +335,14 @@ Title & & & & \\
 \quad Size     & 36 pt   & 48 pt   & 48 pt   & 36 pt \\
 \addlinespace
 Subtitle & & & & \\
-\quad Typeface & --      & --      & serif   & -- \\
-\quad Style    & --      & --      & upright & -- \\
-\quad Size     & --      & --      & 20 pt   & -- \\
+\quad Typeface & \na     & \na     & serif   & \na \\
+\quad Style    & \na     & \na     & upright & \na \\
+\quad Size     & \na     & \na     & 20 pt   & \na \\
 \addlinespace
 Edition & & & & \\
-\quad Typeface & sans serif           & --      & --      & -- \\
-\quad Style    & upright, caps & --      & --      & -- \\
-\quad Size     & 14 pt                & --      & --      & -- \\
+\quad Typeface & sans serif    & \na  & \na  & \na \\
+\quad Style    & upright, caps & \na  & \na  & \na \\
+\quad Size     & 14 pt         & \na  & \na  & \na \\
 \addlinespace
 Publisher & & & & \\
 \quad Typeface & serif   & serif   & serif   & sans serif \\
@@ -369,7 +400,7 @@ The following font sizes are defined by the \TL classes:
       \LaTeX{} size & Font size & Leading & Used for \\
       \midrule
       \verb+\tiny+         &  5 &  6 & sidenote numbers \\
-      \verb+\scriptsize+   &  7 &  8 & --- \\
+      \verb+\scriptsize+   &  7 &  8 & \na \\
       \verb+\footnotesize+ &  8 & 10 & sidenotes, captions \\
       \verb+\small+        &  9 & 12 & quote, quotation, and verse environments \\
       \verb+\normalsize+   & 10 & 14 & body text \\
@@ -388,7 +419,7 @@ The following font sizes are defined by the \TL classes:
 \section{Headings}\label{sec:headings1}\index{headings}
 
 Tufte's books include the following heading levels: parts,
-chapters,\sidenote{Parts and chapters are defined for the \texttt{tufte\-book}
+chapters,\sidenote{Parts and chapters are defined for the \texttt{tufte-book}
 class only.}  sections, subsections, and paragraphs.  Not defined by default
 are: sub-subsections and subparagraphs.
 
@@ -438,14 +469,14 @@ The following characteristics define the various environments:
 \end{table}
 
 
-\chapter{On the Use of the \texttt{tufte-book} Document Class}
+\chapter[On the Use of the tufte-book Document Class]{On the Use of the \texttt{tufte-book} Document Class}
 \label{ch:tufte-book}
 
-The Tufte-\LaTeX\ document classes define a style similar to the
+The \TL document classes define a style similar to the
 style Edward Tufte uses in his books and handouts.  Tufte's style is known
 for its extensive use of sidenotes, tight integration of graphics with
 text, and well-set typography.  This document aims to be at once a
-demonstration of the features of the Tufte-\LaTeX\ document classes
+demonstration of the features of the \TL document classes
 and a style guide to their use.
 
 \section{Page Layout}\label{sec:page-layout}
@@ -459,14 +490,14 @@ a \Verb|\subsection|.  As Bringhurst points out in \textit{The Elements of
 Typographic Style},\cite{Bringhurst2005} you should ``use as many levels of
 headings as you need: no more, and no fewer.''
 
-The Tufte-\LaTeX\ classes will emit an error if you try to use
+The \TL classes will emit an error if you try to use
 \linebreak\Verb|\subsubsection| and smaller headings.
 
 % let's start a new thought -- a new section
 \newthought{In his later books},\cite{Tufte2006} Tufte
 starts each section with a bit of vertical space, a non-indented paragraph,
 and sets the first few words of the sentence in \textsc{small caps}.  To
-accomplish this using this style, use the \hl{\doccmd{newthought}} command:
+accomplish this using this style, use the \doccmddef{newthought} command:
 \begin{docspec}
   \doccmd{newthought}\{In his later books\}, Tufte starts\ldots
 \end{docspec}
@@ -479,11 +510,11 @@ for sidenotes and small figures.  Any \doccmd{footnote}s will automatically
 be converted to sidenotes.\footnote{This is a sidenote that was entered
 using the \texttt{\textbackslash footnote} command.}  If you'd like to place ancillary
 information in the margin without the sidenote mark (the superscript
-number), you can use the \hl{\doccmd{marginnote}} command.\marginnote{This is a
+number), you can use the \doccmd{marginnote} command.\marginnote{This is a
 margin note.  Notice that there isn't a number preceding the note, and
 there is no number in the main text where this note was written.}
 
-The specification of the \hl{\doccmd{sidenote}} command is:
+The specification of the \doccmddef{sidenote} command is:
 \begin{docspec}
   \doccmd{sidenote}[\docopt{number}][\docopt{offset}]\{\docarg{Sidenote text.}\}
 \end{docspec}
@@ -518,20 +549,20 @@ completely omit the \docopt{offset} argument:
   \doccmd{sidenote}[\docopt{number}]\{\docarg{Sidenote text.}\}
 \end{docspec}
 
-The \doccmd{marginnote} command has a similar \docarg{offset} argument:
+The \doccmddef{marginnote} command has a similar \docarg{offset} argument:
 \begin{docspec}
   \doccmd{marginnote}[\docopt{offset}]\{\docarg{Margin note text.}\}
 \end{docspec}
 
 \section{References}
 References are placed alongside their citations as sidenotes,
-as well.  This can be accomplished using the normal \hl{\doccmd{cite}}
+as well.  This can be accomplished using the normal \doccmddef{cite}
 command.\sidenote{The first paragraph of this document includes a citation.}
 
 The complete list of references may also be printed automatically by using
-the \hl{\doccmd{bibliography}} command.  (See the end of this document for an
+the \doccmddef{bibliography} command.  (See the end of this document for an
 example.)  If you do not want to print a bibliography at the end of your
-document, use the \hl{\doccmd{nobibliography}} command in its place.  
+document, use the \doccmddef{nobibliography} command in its place.  
 
 To enter multiple citations at one location,\cite[-3\baselineskip]{Tufte2006,Tufte1990} you can
 provide a list of keys separated by commas and the same optional vertical
@@ -542,13 +573,13 @@ offset argument: \Verb|\cite{Tufte2006,Tufte1990}|.
 
 \section{Figures and Tables}\label{sec:figures-and-tables}
 Images and graphics play an integral role in Tufte's work.
-In addition to the standard \hl{\docenv{figure}} and \hl{\docenv{tabular}} environments,
+In addition to the standard \docenvdef{figure} and \docenvdef{tabular} environments,
 this style provides special figure and table environments for full-width
 floats.
 
-Full page--width figures and tables may be placed in \hl{\docenv{figure*}} or
-\hl{\docenv{table*}} environments.  To place figures or tables in the margin,
-use the \hl{\docenv{marginfigure}} or \hl{\docenv{margintable}} environments as follows
+Full page--width figures and tables may be placed in \docenvdef{figure*} or
+\docenvdef{table*} environments.  To place figures or tables in the margin,
+use the \docenvdef{marginfigure} or \docenvdef{margintable} environments as follows
 (see figure~\ref{fig:marginfig}):
 
 \begin{marginfigure}%
@@ -592,12 +623,34 @@ environment and figure~\ref{fig:textfig} is an example of the normal
 \begin{figure}
   \includegraphics{hilbertcurves.pdf}
 %  \checkparity This is an \pageparity\ page.%
-  \caption{Hilbert curves of various degrees $n$.
-  \emph{Notice that this figure only takes up the main textblock width.}}
+  \caption[Hilbert curves of various degrees $n$.][6pt]{Hilbert curves of various degrees $n$. \emph{Notice that this figure only takes up the main textblock width.}}
   \label{fig:textfig}
   %\zsavepos{pos:textfig}
 \end{figure}
 
+As with sidenotes and marginnotes, a caption may sometimes require vertical
+adjustment. The \doccmddef{caption} command now takes a second optional
+argument that enables you to do this by providing a dimension \docopt{offset}.
+You may specify the caption in any one of the following forms:
+\begin{docspec}
+  \doccmd{caption}\{\docarg{long caption}\}\\
+  \doccmd{caption}[\docarg{short caption}]\{\docarg{long caption}\}\\
+  \doccmd{caption}[][\docopt{offset}]\{\docarg{long caption}\}\\
+  \doccmd{caption}[\docarg{short caption}][\docopt{offset}]%
+                  \{\docarg{long caption}\}
+\end{docspec}
+A positive \docopt{offset} will push the caption down the page. The short
+caption, if provided, is what appears in the list of figures/tables, otherwise
+the ``long'' caption appears there. Note that although the arguments
+\docopt{short caption} and \docopt{offset} are both optional, they must be
+provided in order. Thus, to specify an \docopt{offset} without specifying a
+\docopt{short caption}, you must include the first set of empty brackets
+\Verb|[]|, which tell \doccmd{caption} to use the default ``long'' caption. As
+an example, the caption to figure~\ref{fig:textfig} above was given in the form
+\begin{docspec}
+  \doccmd{caption}[Hilbert curves...][6pt]\{Hilbert curves...\}
+\end{docspec}
+
 Table~\ref{tab:normaltab} shows table created with the \docpkg{booktabs}
 package.  Notice the lack of vertical rules---they serve only to clutter
 the table's data.
@@ -621,9 +674,103 @@ the table's data.
   %\zsavepos{pos:normaltab}
 \end{table}
 
+\newthought{Occasionally} \LaTeX{} will generate an error message:\label{err:too-many-floats}
+\begin{docspec}
+  Error: Too many unprocessed floats
+\end{docspec}
+\LaTeX{} tries to place floats in the best position on the page.  Until it's
+finished composing the page, however, it won't know where those positions are.
+If you have a lot of floats on a page (including sidenotes, margin notes,
+figures, tables, etc.), \LaTeX{} may run out of ``slots'' to keep track of them
+and will generate the above error.
+
+\LaTeX{} initially allocates 18 slots for storing floats.  To work around this
+limitation, the \TL document classes provide a \doccmddef{morefloats} command
+that will reserve more slots.
+
+The first time \doccmd{morefloats} is called, it allocates an additional 34
+slots.  The second time \doccmd{morefloats} is called, it allocates another 26
+slots.
+
+The \doccmd{morefloats} command may only be used two times.  Calling it a
+third time will generate an error message.  (This is because we can't safely
+allocate many more floats or \LaTeX{} will run out of memory.)
+
+If, after using the \doccmd{morefloats} command twice, you continue to get the
+\texttt{Too many unprocessed floats} error, there are a couple things you can
+do.
+
+The \doccmddef{FloatBarrier} command will immediately process all the floats
+before typesetting more material.  Since \doccmd{FloatBarrier} will start a new
+paragraph, you should place this command at the beginning or end of a
+paragraph.
+
+The \doccmddef{clearpage} command will also process the floats before
+continuing, but instead of starting a new paragraph, it will start a new page.
+
+You can also try moving your floats around a bit: move a figure or table to the
+next page or reduce the number of sidenotes.  (Each sidenote actually uses
+\emph{two} slots.)
+
+After the floats have placed, \LaTeX{} will mark those slots as unused so they
+are available for the next page to be composed.
+
+\section{Captions}
+You may notice that the captions are sometimes misaligned.
+Due to the way \LaTeX's float mechanism works, we can't know for sure where it
+decided to put a float. Therefore, the \TL document classes provide commands to
+override the caption position.
+
+\paragraph{Vertical alignment} To override the vertical alignment, use the
+\doccmd{setfloatalignment} command inside the float environment.  For
+example:
+
+\begin{fullwidth}
+\begin{docspec}
+  \textbackslash begin\{figure\}[btp]\\
+  \qquad \textbackslash includegraphics\{sinewave\}\\
+  \qquad \textbackslash caption\{This is an example of a sine wave.\}\\
+  \qquad \textbackslash label\{fig:sinewave\}\\
+  \qquad \hlred{\textbackslash setfloatalignment\{b\}\% forces caption to be bottom-aligned}\\
+  \textbackslash end\{figure\}
+\end{docspec}
+\end{fullwidth}
+
+\noindent The syntax of the \doccmddef{setfloatalignment} command is:
+
+\begin{docspec}
+  \doccmd{setfloatalignment}\{\docopt{pos}\}
+\end{docspec}
+
+\noindent where \docopt{pos} can be either \texttt{b} for bottom-aligned
+captions, or \texttt{t} for top-aligned captions.
+
+\paragraph{Horizontal alignment}\label{par:overriding-horizontal}
+To override the horizontal alignment, use either the \doccmd{forceversofloat}
+or the \doccmd{forcerectofloat} command inside of the float environment.  For
+example:
+
+\begin{fullwidth}
+\begin{docspec}
+  \textbackslash begin\{figure\}[btp]\\
+  \qquad \textbackslash includegraphics\{sinewave\}\\
+  \qquad \textbackslash caption\{This is an example of a sine wave.\}\\
+  \qquad \textbackslash label\{fig:sinewave\}\\
+  \qquad \hlred{\textbackslash forceversofloat\% forces caption to be set to the left of the float}\\
+  \textbackslash end\{figure\}
+\end{docspec}
+\end{fullwidth}
+
+The \doccmddef{forceversofloat} command causes the algorithm to assume the
+float has been placed on a verso page---that is, a page on the left side of a
+two-page spread.  Conversely, the \doccmddef{forcerectofloat} command causes
+the algorithm to assume the float has been placed on a recto page---that is, a
+page on the right side of a two-page spread.
+
+
 \section{Full-width text blocks}
 
-In addition to the new float types, there is a \hl{\docenv{fullwidth}}
+In addition to the new float types, there is a \docenvdef{fullwidth}
 environment that stretches across the main text block and the sidenotes
 area.
 
@@ -650,13 +797,13 @@ existing commands for letterspacing.
 
 When setting strings of \allcaps{ALL CAPS} or \smallcaps{small caps}, the
 letter\-spacing---that is, the spacing between the letters---should be
-increased slightly.\cite{Bringhurst2005}  The \hl{\doccmd{allcaps}} command has proper letterspacing for
-strings of \allcaps{FULL CAPITAL LETTERS}, and the \hl{\doccmd{smallcaps}} command
+increased slightly.\cite{Bringhurst2005}  The \doccmddef{allcaps} command has proper letterspacing for
+strings of \allcaps{FULL CAPITAL LETTERS}, and the \doccmddef{smallcaps} command
 has letterspacing for \smallcaps{small capital letters}.  These commands
 will also automatically convert the case of the text to upper- or
 lowercase, respectively.
 
-The \hl{\doccmd{textsc}} command has also been redefined to include
+The \doccmddef{textsc} command has also been redefined to include
 letterspacing.  The case of the \doccmd{textsc} argument is left as is,
 however.  This allows one to use both uppercase and lowercase letters:
 \textsc{The Initial Letters Of The Words In This Sentence Are Capitalized.}
@@ -671,72 +818,356 @@ document class.  Therefore, you can pass any of the typical book
 options.  There are a few options that are specific to the
 \doccls{tufte-book} document class, however.
 
-The \hl{\docclsopt{a4paper}} option will set the paper size to \smallcaps{A4} instead of
+The \docclsoptdef{a4paper} option will set the paper size to \smallcaps{A4} instead of
 the default \smallcaps{US} letter size.
 
-The \hl{\docclsopt{sfsidenotes}} option will set the sidenotes and title block in a 
+The \docclsoptdef{sfsidenotes} option will set the sidenotes and title block in a 
 \textsf{sans serif} typeface instead of the default roman.
 
-The \hl{\docclsopt{twoside}} option will modify the running heads so that the page
+The \docclsoptdef{twoside} option will modify the running heads so that the page
 number is printed on the outside edge (as opposed to always printing the page
-number on the right-side edge in \hl{\docclsopt{oneside}} mode).  
+number on the right-side edge in \docclsoptdef{oneside} mode).  
 
-The \hl{\docclsopt{symmetric}} option typesets the sidenotes on the outside edge of
+The \docclsoptdef{symmetric} option typesets the sidenotes on the outside edge of
 the page.  This is how books are traditionally printed, but is contrary to
 Tufte's book design which sets the sidenotes on the right side of the page.
 This option implicitly sets the \docclsopt{twoside} option.
 
-The \hl{\docclsopt{justified}} option sets all the text fully justified (flush left
+The \docclsoptdef{justified} option sets all the text fully justified (flush left
 and right).  The default is to set the text ragged right.  
 The body text of Tufte's books are set ragged right.  This prevents
 needless hyphenation and makes it easier to read the text in the slightly
 narrower column.
 
-The \hl{\docclsopt{bidi}} option loads the \docpkg{bidi} package which is used with
+The \docclsoptdef{bidi} option loads the \docpkg{bidi} package which is used with
 \tXeLaTeX\ to typeset bi-directional text.  Since the \docpkg{bidi}
 package needs to be loaded before the sidenotes and cite commands are defined,
 it can't be loaded in the document preamble.
 
-The \hl{\docclsopt{debug}} option causes the Tufte-\LaTeX\ classes to output debug
+The \docclsoptdef{debug} option causes the \TL classes to output debug
 information to the log file which is useful in troubleshooting bugs.  It will
 also cause the graphics to be replaced by outlines.
 
-The \hl{\docclsopt{nofonts}} option prevents the Tufte-\LaTeX\ classes from
+The \docclsoptdef{nofonts} option prevents the \TL classes from
 automatically loading the Palatino and Helvetica typefaces.  You should use
 this option if you wish to load your own fonts.  If you're using \tXeLaTeX, this
 option is implied (\ie, the Palatino and Helvetica fonts aren't loaded if you
 use \tXeLaTeX).  
 
-The \hl{\docclsopt{nols}} option inhibits the letterspacing code.  The Tufte-\LaTeX\
+The \docclsoptdef{nols} option inhibits the letterspacing code.  The \TL\
 classes try to load the appropriate letterspacing package (either pdf\TeX's
 \docpkg{letterspace} package or the \docpkg{soul} package).  If you're using
 \tXeLaTeX\ with \docpkg{fontenc}, however, you should configure your own
 letterspacing.  
 
-The \hl{\docclsopt{notitlepage}} option causes \verb|\maketitle| to generate a title
+The \docclsoptdef{notitlepage} option causes \doccmd{maketitle} to generate a title
 block instead of a title page.  The \doccls{book} class defaults to a title
 page and the \doccls{handout} class defaults to the title block.  There is an
-analogous \hl{\docclsopt{titlepage}} option that forces \verb|\maketitle| to
+analogous \docclsoptdef{titlepage} option that forces \doccmd{maketitle} to
 generate a full title page instead of the title block.
 
-The \hl{\docclsopt{notoc}} option suppresses Tufte-\LaTeX's custom table of contents
+The \docclsoptdef{notoc} option suppresses \TL's custom table of contents
 (\textsc{toc}) design.  The current \textsc{toc} design only shows unnumbered
 chapter titles; it doesn't show sections or subsections.  The \docclsopt{notoc}
 option will revert to \LaTeX's \textsc{toc} design.
 
+The \docclsoptdef{nohyper} option prevents the \docpkg{hyperref} package from
+being loaded.  The default is to load the \docpkg{hyperref} package and use the
+\doccmd{title} and \doccmd{author} contents as metadata for the generated
+\textsc{pdf}.
+
 \index{class options|)}
 
 
-\chapter{Debug Stuff}
+
+\chapter[Customizing Tufte-LaTeX]{Customizing \TL}
+\label{ch:customizing}
+
+The \TL document classes are designed to closely emulate Tufte's book
+design by default.  However, each document is different and you may encounter
+situations where the default settings are insufficient.  This chapter explores
+many of the ways you can adjust the \TL document classes to better fit
+your needs.
+
+\section{File Hooks}
+\label{sec:filehooks}
+
+\index{file hooks|(}
+If you create many documents using the \TL classes, it's easier to
+store your customizations in a separate file instead of copying them into the
+preamble of each document.  The \TL classes provide three file hooks:
+\docfilehook{tufte-common-local.tex}{common}, \docfilehook{tufte-book-local.tex}{book}, and
+\docfilehook{tufte-handout-local.tex}{handout}.\sloppy
+
+\begin{description}
+  \item[\docfilehook{tufte-common-local.tex}{common}]
+    If this file exists, it will be loaded by all of the \TL document
+    classes just prior to any document-class-specific code.  If your
+    customizations or code should be included in both the book and handout
+    classes, use this file hook.
+  \item[\docfilehook{tufte-book-local.tex}{book}] 
+    If this file exists, it will be loaded after all of the common and
+    book-specific code has been read.  If your customizations apply only to the
+    book class, use this file hook.
+  \item[\docfilehook{tufte-common-handout.tex}{handout}] 
+    If this file exists, it will be loaded after all of the common and
+    handout-specific code has been read.  If your customizations apply only to
+    the handout class, use this file hook.
+\end{description}
+
+\index{file hooks|)}
+
+\section{Numbered Section Headings}
+\label{sec:numbered-sections}
+\index{headings!numbered}
+
+While Tufte dispenses with numbered headings in his books, if you require them,
+they can be anabled by changing the value of the \doccounter{secnumdepth}
+counter.  From the table below, select the heading level at which numbering
+should stop and set the \doccounter{secnumdepth} counter to that value.  For
+example, if you want parts and chapters numbered, but don't want numbering for
+sections or subsections, use the command:
+\begin{docspec}
+  \doccmd{setcounter}\{secnumdepth\}\{0\}
+\end{docspec}
+
+The default \doccounter{secnumdepth} for the \TL document classes is $-1$.
+
+\begin{table}
+  \footnotesize
+  \begin{center}
+    \begin{tabular}{lr}
+      \toprule
+      Heading level & Value \\
+      \midrule
+      Part (in \doccls{tufte-book}) & $-1$ \\
+      Part (in \doccls{tufte-handout}) & $0$ \\
+      Chapter (only in \doccls{tufte-book}) & $0$ \\
+      Section & $1$ \\
+      Subsection & $2$ \\
+      Subsubsection & $3$ \\
+      Paragraph & $4$ \\
+      Subparagraph & $5$ \\
+      \bottomrule
+    \end{tabular}
+  \end{center}
+  \caption{Heading levels used with the \texttt{secnumdepth} counter.}
+\end{table}
+
+\section{Changing the Paper Size}
+\label{sec:paper-size}
+
+The \TL classes currently only provide three paper sizes: \textsc{a4},
+\textsc{b5}, and \textsc{us} letter.  To specify a different paper size (and/or
+margins), use the \doccmd[geometry]{geometrysetup} command in the preamble of your
+document (or one of the file hooks).  The full documentation of the
+\doccmd{geometrysetup} command may be found in the \docpkg{geometry} package
+documentation.\cite{pkg-geometry}
+
+
+\section{Customizing Marginal Material}
+\label{sec:marginal-material}
+
+Marginal material includes sidenotes, citations, margin notes, and captions.
+Normally, the justification of the marginal material follows the justification
+of the body text.  If you specify the \docclsopt{justified} document class
+option, all of the margin material will be fully justified as well.  If you
+don't specify the \docclsopt{justified} option, then the marginal material will
+be set ragged right.
+
+You can set the justification of the marginal material separately from the body
+text using the following document class options: \docclsopt{sidenote},
+\docclsopt{marginnote}, \docclsopt{caption}, \docclsopt{citation}, and
+\docclsopt{marginals}.  Each option refers to its obviously corresponding
+marginal material type.  The \docclsopt{marginals} option simultaneously sets
+the justification on all four marginal material types.
+
+Each of the document class options takes one of five justification types:
+\begin{description}
+  \item[\docclsopt{justified}] Fully justifies the text (sets it flush left and
+    right).
+  \item[\docclsopt{raggedleft}] Sets the text ragged left, regardless of which
+    page it falls on.
+  \item[\docclsopt{raggedright}] Sets the text ragged right, regardless of
+    which page it falls on.
+  \item[\doccls{raggedouter}] Sets the text ragged left if it falls on the
+    left-hand (verso) page of the spread and otherwise sets it ragged right.
+    This is useful in conjunction with the \docclsopt{symmetric} document class
+    option.
+  \item[\docclsopt{auto}] If the \docclsopt{justified} document class option
+    was specified, then set the text fully justified; otherwise the text is set
+    ragged right.  This is the default justification option if one is not
+    explicitly specified.
+\end{description}
+
+\noindent For example, 
+\begin{docspec}
+  \doccmdnoindex{documentclass}[symmetric,justified,marginals=raggedouter]\{tufte-book\}
+\end{docspec}
+will set the body text of the document to be fully justified and all of the
+margin material (sidenotes, margin notes, captions, and citations) to be flush
+against the body text with ragged outer edges.
+
+\newthought{The font and style} of the marginal material may also be modified using the following commands:
+
+\begin{docspec}
+  \doccmd{setsidenotefont}\{\docopt{font commands}\}\\
+  \doccmd{setcaptionfont}\{\docopt{font commands}\}\\
+  \doccmd{setmarginnotefont}\{\docopt{font commands}\}\\
+  \doccmd{setcitationfont}\{\docopt{font commands}\}
+\end{docspec}
+
+The \doccmddef{setsidenotefont} sets the font and style for sidenotes, the
+\doccmddef{setcaptionfont} for captions, the \doccmddef{setmarginnotefont} for
+margin notes, and the \doccmddef{setcitationfont} for citations.  The
+\docopt{font commands} can contain font size changes (e.g.,
+\doccmdnoindex{footnotesize}, \doccmdnoindex{Huge}, etc.), font style changes (e.g.,
+\doccmdnoindex{sffamily}, \doccmdnoindex{ttfamily}, \doccmdnoindex{itshape}, etc.), color changes (e.g.,
+\doccmdnoindex{color}\texttt{\{blue\}}), and many other adjustments.
+
+If, for example, you wanted the captions to be set in italic sans serif, you could use:
+\begin{docspec}
+  \doccmd{setcaptionfont}\{\doccmdnoindex{itshape}\doccmdnoindex{sffamily}\}
+\end{docspec}
+
+\chapter{Compatibility Issues}
+\label{ch:compatibility}
+
+When switching an existing document from one document class to a \TL document class, a few changes to the document may have to be made.
+
+\section{Converting from \doccls{article} to \doccls{tufte-handout}}
+
+The following \doccls{article} class options are unsupported: \docclsopt{10pt}, \docclsopt{11pt}, \docclsopt{12pt}, \docclsopt{a5paper}, \docclsopt{b5paper}, \docclsopt{executivepaper}, \docclsopt{legalpaper}, \docclsopt{landscape}, \docclsopt{onecolumn}, and \doccls{twocolumn}.
+
+The following headings are not supported: \doccmd{subsubsection} and \doccmd{subparagraph}.
+
+\section{Converting from \doccls{book} to \doccls{tufte-book}}
+
+The following \doccls{report} class options are unsupported: \docclsopt{10pt}, \docclsopt{11pt}, \docclsopt{12pt}, \docclsopt{a5paper}, \docclsopt{b5paper}, \docclsopt{executivepaper}, \docclsopt{legalpaper}, \docclsopt{landscape}, \docclsopt{onecolumn}, and \doccls{twocolumn}.
+
+The following headings are not supported: \doccmd{subsubsection} and \doccmd{subparagraph}.
+
+
+
+\chapter{Troubleshooting and Support}
+\label{ch:troubleshooting}
+
+\section{\TL Website}\label{sec:website}
+The website for the \TL packages is located at
+\url{http://code.google.com/p/tufte-latex/}.  On our website, you'll find
+links to our \smallcaps{svn} repository, mailing lists, bug tracker, and documentation.
+
+\section{\TL Mailing Lists}\label{sec:mailing-lists}
+There are two mailing lists for the \TL project:
+
+\paragraph{Discussion list}
+The \texttt{tufte-latex} discussion list is for asking questions, getting
+assistance with problems, and help with troubleshooting.  Release announcements
+are also posted to this list.  You can subscribe to the \texttt{tufte-latex}
+discussion list at \url{http://groups.google.com/group/tufte-latex}.
+
+\paragraph{Commits list}
+The \texttt{tufte-latex-commits} list is a read-only mailing list.  A message
+is sent to the list any time the \TL code has been updated.  If you'd like to
+keep up with the latest code developments, you may subscribe to this list.  You
+can subscribe to the \texttt{tufte-latex-commits} mailing list at
+\url{http://groups.google.com/group/tufte-latex-commits}.
+
+\section{Getting Help}\label{sec:getting-help}
+If you've encountered a problem with one of the \TL document classes, have a
+question, or would like to report a bug, please send an email to our
+mailing list or visit our website.
+
+To help us troubleshoot the problem more quickly, please try to compile your
+document using the \docclsopt{debug} class option and send the generated
+\texttt{.log} file to the mailing list with a brief description of the problem.
+
+
+
+\section{Errors, Warnings, and Informational Messages}\label{sec:tl-messages}
+The following is a list of all of the errors, warnings, and other messages generated by the \TL classes and a brief description of their meanings.
+\index{error messages}\index{warning messages}\index{debug messages}
+
+% Errors
+\docmsg{Error: \doccmd{subparagraph} is undefined by this class.}{%
+The \doccmd{subparagraph} command is not defined in the \TL document classes.
+If you'd like to use the \doccmd{subparagraph} command, you'll need to redefine
+it yourself.  See the ``Headings'' section on page~\pageref{sec:headings} for a
+description of the heading styles availaboe in the \TL document classes.}
+
+\docmsg{Error: \doccmd{subsubsection} is undefined by this class.}{%
+The \doccmd{subsubsection} command is not defined in the \TL document classes.
+If you'd like to use the \doccmd{subsubsection} command, you'll need to
+redefine it yourself.  See the ``Headings'' section on
+page~\pageref{sec:headings} for a description of the heading styles availaboe
+in the \TL document classes.}
+
+\docmsg{Error: You may only call \doccmd{morefloats} twice. See the\par\noindent\ \ \ \ \ \ \ \ Tufte-LaTeX documentation for other workarounds.}{%
+\LaTeX{} allocates 18 slots for storing floats.  The first time
+\doccmd{morefloats} is called, it allocates an additional 34 slots.  The second
+time \doccmd{morefloats} is called, it allocates another 26 slots.
+
+The \doccmd{morefloats} command may only be called two times.  Calling it a
+third time will generate this error message.  See
+page~\pageref{err:too-many-floats} for more information.}
+
+% Warnings
+\docmsg{Warning: Option `\docopt{class option}' is not supported -{}- ignoring option.}{%
+This warning appears when you've tried to use \docopt{class option} with a \TL
+document class, but \docopt{class option} isn't supported by the \TL document
+class.  In this situation, \docopt{class option} is ignored.}
+
+% Info / Debug messages
+\docmsg{Info: The `\docclsopt{symmetric}' option implies `\docclsopt{twoside}'}{%
+You specified the \docclsopt{symmetric} document class option.  This option automatically forces the \docclsopt{twoside} option as well.  See page~\pageref{clsopt:symmetric} for more information on the \docclsopt{symmetric} class option.}
+
+
+\section{Package Dependencies}\label{sec:dependencies}
+The following is a list of packages that the \TL document
+classes rely upon.  Packages marked with an asterisk are optional.
+\begin{multicols}{2}
+\begin{itemize}
+  \item xifthen
+  \item ifpdf*
+  \item ifxetex*
+  \item hyperref
+  \item geometry
+  \item ragged2e
+  \item chngpage \emph{or} changepage
+  \item paralist
+  \item textcase
+  \item soul*
+  \item letterspace*
+  \item setspace
+  \item natbib \emph{and} bibentry
+  \item optparams
+  \item placeins
+  \item mathpazo*
+  \item helvet*
+  \item fontenc
+  \item beramono*
+  \item fancyhdr
+  \item xcolor
+  \item textcomp
+  \item titlesec
+  \item titletoc
+\end{itemize}
+\end{multicols}
+
+
 
 
 %%
 % The back matter contains appendices, bibliographies, indices, glossaries, etc.
 
-\backmatter
 
 
 
+
+
+
+\backmatter
+
 \bibliography{sample-handout}
 \bibliographystyle{plainnat}
 
diff --git a/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.bib b/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.bib
index 95e715e29ec..a46a71f7630 100644
--- a/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.bib
+++ b/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.bib
@@ -54,4 +54,12 @@
 	isbn = {0-201-36299-6}
 }
 
+@MISC{pkg-geometry,
+    author = {Hideo Umeki},
+    title = {The \texttt{geometry} package},
+    year = {2008},
+    month = dec,
+    howpublished = {\url{http://ctan.org/pkg/geometry}}
+}
+
 
diff --git a/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.pdf b/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.pdf
index 457890656de..b6cbef076ff 100644
--- a/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.pdf
+++ b/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.pdf
diff --git a/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.tex b/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.tex
index 3d8309f9f7e..896a49391f8 100644
--- a/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.tex
+++ b/Master/texmf-dist/doc/latex/tufte-latex/sample-handout.tex
@@ -47,7 +47,8 @@
 
 \begin{abstract}
 \noindent This document describes the Tufte handout \LaTeX\ document style.
-It also provides examples and comments on the style's use.
+It also provides examples and comments on the style's use.  Only a brief
+overview is presented here; for a complete reference, see the sample book.
 \end{abstract}
 
 %\printclassoptions
@@ -64,28 +65,9 @@ and a style guide to their use.
 This style provides \textsc{a}- and \textsc{b}-heads (that is,
 \Verb|\section| and \Verb|\subsection|), demonstrated above.
 
-If you need more than two levels of section headings, you'll have to define
-them yourself at the moment;\sidenote{See see ``\nameref{sec:defining-sections}'' on
-page~\pageref{sec:defining-sections} for help with defining more heading
-levels.} there are no pre-defined styles for anything below a
-\Verb|\subsection|.  As Bringhurst points out in \textit{The Elements of
-Typographic Style},\cite{Bringhurst2005} you should ``use as many levels of
-headings as you need: no more, and no fewer.''
-
 The Tufte-\LaTeX\ classes will emit an error if you try to use
 \linebreak\Verb|\subsubsection| and smaller headings.
 
-%\medskip
-%\begin{fullwidth}
-%\begin{Verbatim}
-%! Package tufte-handout Error: \subsubsection is undefined by this class.
-%(tufte-handout)                See Robert Bringhurst's _The Elements of 
-%(tufte-handout)                Typographic Style_, section 4.2.2. 
-%(tufte-handout)                \subsubsection was used.
-%\end{Verbatim}
-%\end{fullwidth}
-%\medskip
-
 % let's start a new thought -- a new section
 \newthought{In his later books},\cite{Tufte2006} Tufte
 starts each section with a bit of vertical space, a non-indented paragraph,
@@ -156,7 +138,7 @@ the \Verb|\bibliography| command.  (See the end of this document for an
 example.)  If you do not want to print a bibliography at the end of your
 document, use the \Verb|\nobibliography| command in its place.  
 
-To enter multiple citations at one location,\cite[-3\baselineskip]{Tufte2006,Tufte1990} you can
+To enter multiple citations at one location,\cite{Tufte2006,Tufte1990} you can
 provide a list of keys separated by commas and the same optional vertical
 offset argument: \Verb|\cite{Tufte2006,Tufte1990}|.  
 \begin{docspec}
@@ -217,6 +199,7 @@ environment and figure~\ref{fig:textfig} is an example of the normal
   \emph{Notice that this figure only takes up the main textblock width.}}
   \label{fig:textfig}
   %\zsavepos{pos:textfig}
+  \setfloatalignment{b}
 \end{figure}
 
 Table~\ref{tab:normaltab} shows table created with the \docpkg{booktabs}
@@ -283,43 +266,6 @@ however.  This allows one to use both uppercase and lowercase letters:
 \textsc{The Initial Letters Of The Words In This Sentence Are Capitalized.}
 
 
-\section{Customization}\label{sec:customization}
-\subsection{Document class options}\label{sec:options}
-The \doccls{tufte-handout} class is based on the \LaTeX\ \doccls{article}
-document class.  Therefore, you can pass any of the typical article
-options.  There are a few options that are specific to the
-\doccls{tufte-handout} document class, however.
-
-The \docclsopt{a4paper} option will set the paper size to \smallcaps{A4} instead of
-the default \smallcaps{US} letter size.
-
-The \docclsopt{sfsidenotes} option will set the sidenotes and title block in a 
-\textsf{sans serif} typeface instead of the default roman.
-
-The \docclsopt{twoside} option will modify the running heads so that the page
-number is printed on the outside edge (as opposed to always printing the page
-number on the right-side edge in \docclsopt{oneside} mode).  
-
-The \docclsopt{symmetric} option typesets the sidenotes on the outside edge of
-the page.  This is how books are traditionally printed, but is contrary to
-Tufte's book design which sets the sidenotes on the right side of the page.
-This option implicitly sets the \docclsopt{twoside} option.
-
-The \docclsopt{justified} option sets all the text fully justified (flush left
-and right).  The default is to set the text ragged right.  
-The body text of Tufte's books are set ragged right.  This prevents
-needless hyphenation and makes it easier to read the text in the slightly
-narrower column.
-
-\subsection{Defining new sections}\label{sec:defining-sections}
-As mentioned in the ``\nameref{sec:headings}'' section (see
-page~\pageref{sec:headings}), the \doccls{tufte\-handout} document class only
-defines \doccmd{section} and \doccmd{subsection} headings.  
-
-We use the \docpkg{titlesec} package to define the appearance of the headings.
-To modify an existing section or to add a new section, see the documentation of
-the \docpkg{titlesec} package.
-
 
 \section{Installation}\label{sec:installation}
 To install the Tufte-\LaTeX\ classes, simply drop the
@@ -327,7 +273,7 @@ following files into the same directory as your \texttt{.tex}
 file:
 \begin{quote}
   \ttfamily
-  tufte-common.sty\\
+  tufte-common.def\\
   tufte-handout.cls\\
   tufte-book.cls
 \end{quote}
@@ -335,41 +281,13 @@ file:
 % TODO add instructions for installing it globally
 
 
+
+\section{More Documentation}\label{sec:more-doc}
+For more documentation on the Tufte-\LaTeX{} document classes (including commands not
+mentioned in this handout), please see the sample book.
+
 \section{Support}\label{sec:support}
 
-\subsection{Package Dependencies}\label{sec:dependencies}
-The following is a list of packages that the Tufte-\LaTeX\ document
-classes rely upon.  Packages marked with an asterisk are optional.
-\begin{multicols}{2}
-\begin{itemize}
-  \item xifthen
-  \item ifpdf*
-  \item ifxetex*
-  \item hyperref
-  \item geometry
-  \item ragged2e
-  \item chngpage \emph{or} changepage
-  \item paralist
-  \item textcase
-  \item soul*
-  \item letterspace*
-  \item setspace
-  \item natbib \emph{and} bibentry
-  \item optparams
-  \item placeins
-  \item mathpazo*
-  \item helvet*
-  \item fontenc
-  \item beramono*
-  \item fancyhdr
-  \item xcolor
-  \item textcomp
-  \item titlesec
-  \item titletoc
-\end{itemize}
-\end{multicols}
-
-\subsection{Tufte-\LaTeX\ Website}\label{sec:website}
 The website for the Tufte-\LaTeX\ packages is located at
 \url{http://code.google.com/p/tufte-latex/}.  On our website, you'll find
 links to our \smallcaps{svn} repository, mailing lists, bug tracker, and documentation.
diff --git a/Master/texmf-dist/source/latex/tufte-latex/sample-book.pdf b/Master/texmf-dist/source/latex/tufte-latex/sample-book.pdf
deleted file mode 100644
index 09378a26ca4..00000000000
--- a/Master/texmf-dist/source/latex/tufte-latex/sample-book.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/latex/tufte-latex/sample-book.tex b/Master/texmf-dist/source/latex/tufte-latex/sample-book.tex
deleted file mode 100644
index eb95dec6311..00000000000
--- a/Master/texmf-dist/source/latex/tufte-latex/sample-book.tex
+++ /dev/null
@@ -1,747 +0,0 @@
-\documentclass{tufte-book}
-
-%%
-% Book metadata
-\title{A Tufte-Style Book\thanks{Thanks to Edward R.~Tufte for his inspiration.}}
-\author[The Tufte-LaTeX Developers]{The Tufte-LaTeX\ Developers}
-\publisher{Publisher of This Book}
-
-%%
-% If they're installed, use Bergamo and Chantilly from www.fontsite.com.
-% They're clones of Bembo and Gill Sans, respectively.
-%\IfFileExists{bergamo.sty}{\usepackage[osf]{bergamo}}{}% Bembo
-%\IfFileExists{chantill.sty}{\usepackage{chantill}}{}% Gill Sans
-
-%\usepackage{microtype}
-
-%%
-% Just some sample text
-\usepackage{lipsum}
-
-%%
-% For nicely typeset tabular material
-\usepackage{booktabs}
-
-%%
-% For graphics / images
-\usepackage{graphicx}
-\setkeys{Gin}{width=\linewidth,totalheight=\textheight,keepaspectratio}
-\graphicspath{{graphics/}}
-
-% The fancyvrb package lets us customize the formatting of verbatim
-% environments.  We use a slightly smaller font.
-\usepackage{fancyvrb}
-\fvset{fontsize=\normalsize}
-
-%%
-% Prints argument within hanging parentheses (i.e., parentheses that take
-% up no horizontal space).  Useful in tabular environments.
-\newcommand{\hangp}[1]{\makebox[0pt][r]{(}#1\makebox[0pt][l]{)}}
-
-%%
-% Prints an asterisk that takes up no horizontal space.
-% Useful in tabular environments.
-\newcommand{\hangstar}{\makebox[0pt][l]{*}}
-
-%%
-% Prints a trailing space in a smart way.
-\usepackage{xspace}
-
-%%
-% Some shortcuts for Tufte's book titles.  The lowercase commands will
-% produce the initials of the book title in italics.  The all-caps commands
-% will print out the full title of the book in italics.
-\newcommand{\vdqi}{\textit{VDQI}\xspace}
-\newcommand{\ei}{\textit{EI}\xspace}
-\newcommand{\ve}{\textit{VE}\xspace}
-\newcommand{\be}{\textit{BE}\xspace}
-\newcommand{\VDQI}{\textit{The Visual Display of Quantitative Information}\xspace}
-\newcommand{\EI}{\textit{Envisioning Information}\xspace}
-\newcommand{\VE}{\textit{Visual Explanations}\xspace}
-\newcommand{\BE}{\textit{Beautiful Evidence}\xspace}
-
-\newcommand{\TL}{Tufte-\LaTeX\xspace}
-
-% Prints the month name (e.g., January) and the year (e.g., 2008)
-\newcommand{\monthyear}{%
-  \ifcase\month\or January\or February\or March\or April\or May\or June\or
-  July\or August\or September\or October\or November\or
-  December\fi\space\number\year
-}
-
-
-% Prints an epigraph and speaker in sans serif, all-caps type.
-\newcommand{\openepigraph}[2]{%
-  %\sffamily\fontsize{14}{16}\selectfont
-  \begin{fullwidth}
-  \sffamily\large
-  \begin{doublespace}
-  \noindent\allcaps{#1}\\% epigraph
-  \noindent\allcaps{#2}% author
-  \end{doublespace}
-  \end{fullwidth}
-}
-
-% Inserts a blank page
-\newcommand{\blankpage}{\newpage\hbox{}\thispagestyle{empty}\newpage}
-
-\usepackage{units}
-
-% Typesets the font size, leading, and measure in the form of 10/12x26 pc.
-\newcommand{\measure}[3]{#1/#2$\times$\unit[#3]{pc}}
-
-% Macros for typesetting the documentation
-\newcommand{\hl}[1]{\textcolor{Maroon}{#1}}% prints in red
-\newcommand{\hangleft}[1]{\makebox[0pt][r]{#1}}
-\newcommand{\hairsp}{\hspace{1pt}}% hair space
-\newcommand{\hquad}{\hskip0.5em\relax}% half quad space
-\newcommand{\TODO}{\textcolor{red}{\bf TODO!}\xspace}
-\newcommand{\ie}{\textit{i.\hairsp{}e.}\xspace}
-\newcommand{\eg}{\textit{e.\hairsp{}g.}\xspace}
-\providecommand{\XeLaTeX}{X\lower.5ex\hbox{\kern-0.15em\reflectbox{E}}\kern-0.1em\LaTeX}
-\newcommand{\tXeLaTeX}{\XeLaTeX\index{XeLaTeX@\protect\XeLaTeX}}
-% \index{\texttt{\textbackslash xyz}@\hangleft{\texttt{\textbackslash}}\texttt{xyz}}
-\newcommand{\tuftebs}{\symbol{'134}}% a backslash in tt type in OT1/T1
-\newcommand{\doccmd}[1]{%
-  \texttt{\tuftebs#1}%
-  \index{#1@\protect\hangleft{\texttt{\tuftebs}}\texttt{#1}}%
-}% command name -- adds backslash automatically
-\newcommand{\docopt}[1]{\ensuremath{\langle}\textrm{\textit{#1}}\ensuremath{\rangle}}% optional command argument
-\newcommand{\docarg}[1]{\textrm{\textit{#1}}}% (required) command argument
-\newenvironment{docspec}{\begin{quotation}\ttfamily\parskip0pt\parindent0pt\ignorespaces}{\end{quotation}}% command specification environment
-\newcommand{\docenv}[1]{\texttt{#1}\index{#1@\texttt{#1} environment}\index{environments!#1@\texttt{#1}}}% environment name
-\newcommand{\docpkg}[1]{\texttt{#1}\index{#1@\texttt{#1} package}\index{packages!#1@\texttt{#1}}}% package name
-\newcommand{\doccls}[1]{\texttt{#1}}% document class name
-\newcommand{\docclsopt}[1]{\texttt{#1}\index{#1@\texttt{#1} class option}\index{class options!#1@\texttt{#1}}}% document class option name
-
-% Generates the index
-\usepackage{makeidx}
-\makeindex
-
-\begin{document}
-
-% Front matter
-\frontmatter
-
-% r.1 blank page
-\blankpage
-
-% v.2 epigraphs
-\newpage\thispagestyle{empty}
-\openepigraph{%
-The public is more familiar with bad design than good design.
-It is, in effect, conditioned to prefer bad design, 
-because that is what it lives with. 
-The new becomes threatening, the old reassuring.
-}{Paul Rand%, {\itshape Design, Form, and Chaos}
-}
-\vfill
-\openepigraph{%
-A designer knows that he has achieved perfection 
-not when there is nothing left to add, 
-but when there is nothing left to take away.
-}{Antoine de St-Expurey}
-\vfill
-\openepigraph{%
-\ldots the designer of a new system must not only be the implementor and the first 
-large-scale user; the designer should also write the first user manual\ldots 
-If I had not participated fully in all these activities, 
-literally hundreds of improvements would never have been made, 
-because I would never have thought of them or perceived 
-why they were important.
-}{Donald E. Knuth}
-
-
-% r.3 full title page
-\maketitle
-
-
-% v.4 copyright page
-\newpage
-\begin{fullwidth}
-~\vfill
-\thispagestyle{empty}
-\setlength{\parindent}{0pt}
-\setlength{\parskip}{\baselineskip}
-Copyright \copyright\ \the\year\ \thanklessauthor
-
-\par\smallcaps{Published by \thanklesspublisher}
-
-\par\smallcaps{tufte-latex.googlecode.com}
-
-\par Licensed under the Apache License, Version 2.0 (the ``License''); you may not
-use this file except in compliance with the License. You may obtain a copy
-of the License at \url{http://www.apache.org/licenses/LICENSE-2.0}. Unless
-required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an \smallcaps{``AS IS'' BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND}, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.\index{license}
-
-\par\textit{First printing, \monthyear}
-\end{fullwidth}
-
-% r.5 contents
-\tableofcontents
-
-% r.7 dedication
-\cleardoublepage
-~\vfill
-\begin{doublespace}
-\noindent\fontsize{18}{22}\selectfont\itshape
-\nohyphenation
-Dedicated to those who appreciate \LaTeX{} 
-and the work of \mbox{Edward R.~Tufte} 
-and \mbox{Donald E.~Knuth}.
-\end{doublespace}
-\vfill
-\vfill
-
-
-% r.9 introduction
-\cleardoublepage
-\chapter*{Introduction}
-
-This sample book discusses the design of Edward Tufte's
-books\cite{Tufte2001,Tufte1990,Tufte1997,Tufte2006}
-and the use of the \texttt{tufte-book} and \texttt{sample-handout} document classes.
-
-
-%%
-% Start the main matter (normal chapters)
-\mainmatter
-
-
-\chapter{The Design of Tufte's Books}
-\label{ch:tufte-design}
-
-
-\newthought{The pages} of a book are usually divided into three major
-sections: the front matter (also called preliminary matter or prelim), the
-main matter (the core text of the book), and the back matter (or end
-matter).
-
-\newthought{The front matter} of a book refers to all of the material that
-comes before the main text.  The following table from shows a list of
-material that appears in the front matter of \VDQI, \EI, \VE, and \BE
-along with its page number.  Page numbers that appear in parentheses refer
-to folios that do not have a printed page number (but they are still
-counted in the page number sequence).
-
-\bigskip
-\begin{minipage}{\textwidth}
-\begin{center}
-\begin{tabular}{lcccc}
-\toprule
- & \multicolumn{4}{c}{Books} \\
-\cmidrule(l){2-5} 
-Page content & \vdqi & \ei & \ve & \be \\
-\midrule
-Blank half title page & \hangp{1} & \hangp{1} & \hangp{1} & \hangp{1} \\
-Frontispiece\footnotemark{}
-  & \hangp{2} & \hangp{2} & \hangp{2} & \hangp{2} \\
-Full title page & \hangp{3} & \hangp{3} & \hangp{3} & \hangp{3} \\
-Copyright page & \hangp{4} & \hangp{4} & \hangp{4} & \hangp{4} \\
-Contents & \hangp{5} & \hangp{5} & \hangp{5} & \hangp{5} \\
-%Blank & -- & \hangp{6} & \hangp{6} & \hangp{6} \\
-Dedication & \hangp{6} & \hangp{7} & \hangp{7} & 7 \\
-%Blank & -- & \hangp{8} & -- & \hangp{8} \\
-Epigraph & -- & -- & \hangp{8} & -- \\
-Introduction & \hangp{7} & \hangp{9} & \hangp{9} & 9 \\
-\bottomrule
-\end{tabular}
-\end{center}
-\end{minipage}
-\vspace{-7\baselineskip}\footnotetext{The contents of this page vary from book to book.  In
-  \vdqi this page is blank; in \ei and \ve this page holds a frontispiece;
-  and in \be this page contains three epigraphs.}
-\vspace{7\baselineskip}
-
-\bigskip
-The design of the front matter in Tufte's books varies slightly from the
-traditional design of front matter.  First, the pages in front matter are
-traditionally numbered with lowercase roman numerals (\eg, i, ii, iii,
-iv,~\ldots).  Second, the front matter page numbering sequence is usually
-separate from the main matter page numbering.  That is, the page numbers
-restart at 1 when the main matter begins.  In contrast, Tufte has
-enumerated his pages with arabic numerals that share the same page counting
-sequence as the main matter.  
-
-There are also some variations in design across Tufte's four books.  The
-page opposite the full title page (labeled ``frontispiece'' in the above
-table) has different content in each of the books.  In \VDQI, this page is
-blank; in \EI and \VE, this page holds a frontispiece; and in \BE, this
-page contains three epigraphs.
-
-The dedication appears on page~6 in \vdqi (opposite the introduction), and
-is placed on its own spread in the other books.  In \ve, an epigraph shares
-the spread with the opening page of the introduction.
-
-None of the page numbers (folios) of the front matter are expressed except in
-\be, where the folios start to appear on the dedication page.
-
-\newthought{The full title page} of each of the books varies slightly in
-design.  In all the books, the author's name appears at the top of the
-page, the title it set just above the center line, and the publisher is
-printed along the bottom margin.  Some of the differences are outlined in
-the following table.
-
-\bigskip
-\begin{center}
-\footnotesize
-\begin{tabular}{lllll}
-\toprule
-Feature & \vdqi & \ei & \ve & \be \\
-\midrule
-Author & & & & \\
-\quad Typeface & serif   & serif   & serif   & sans serif \\
-\quad Style    & italics & italics & italics & upright, caps \\
-\quad Size     & 24 pt   & 20 pt   & 20 pt   & 20 pt \\
-\addlinespace
-Title & & & & \\
-\quad Typeface & serif   & serif   & serif   & sans serif \\
-\quad Style    & upright & italics & upright & upright, caps \\
-\quad Size     & 36 pt   & 48 pt   & 48 pt   & 36 pt \\
-\addlinespace
-Subtitle & & & & \\
-\quad Typeface & --      & --      & serif   & -- \\
-\quad Style    & --      & --      & upright & -- \\
-\quad Size     & --      & --      & 20 pt   & -- \\
-\addlinespace
-Edition & & & & \\
-\quad Typeface & sans serif           & --      & --      & -- \\
-\quad Style    & upright, caps & --      & --      & -- \\
-\quad Size     & 14 pt                & --      & --      & -- \\
-\addlinespace
-Publisher & & & & \\
-\quad Typeface & serif   & serif   & serif   & sans serif \\
-\quad Style    & italics & italics & italics & upright, caps \\
-\quad Size     & 14 pt   & 14 pt   & 14 pt   & 14 pt \\
-\bottomrule
-\end{tabular}
-\end{center}
-
-\begin{figure*}[p]
-\fbox{\includegraphics[width=0.45\linewidth]{graphics/vdqi-title.pdf}}
-\hfill
-\fbox{\includegraphics[width=0.45\linewidth]{graphics/ei-title.pdf}}
-\\\vspace{\baselineskip}
-\fbox{\includegraphics[width=0.45\linewidth]{graphics/ve-title.pdf}}
-\hfill
-\fbox{\includegraphics[width=0.45\linewidth]{graphics/be-title.pdf}}
-\end{figure*}
-
-\newthought{The tables of contents} in Tufte's books give us our first
-glimpse of the structure of the main matter.  \VDQI is split into two
-parts, each containing some number of chapters.  His other three books only
-contain chapters---they're not broken into parts.
-
-\begin{figure*}[p]\index{table of contents}
-\fbox{\includegraphics[width=0.45\linewidth]{graphics/vdqi-contents.pdf}}
-\hfill
-\fbox{\includegraphics[width=0.45\linewidth]{graphics/ei-contents.pdf}}
-\\\vspace{\baselineskip}
-\fbox{\includegraphics[width=0.45\linewidth]{graphics/ve-contents.pdf}}
-\hfill
-\fbox{\includegraphics[width=0.45\linewidth]{graphics/be-contents.pdf}}
-\end{figure*}
-
-
-\section{Typefaces}\label{sec:typefaces1}\index{typefaces}
-\index{fonts|see{typefaces}}
-
-Tufte's books primarily use two typefaces: Bembo and Gill Sans.  Bembo is used
-for the headings and body text, while Gill Sans is used for the title page and
-opening epigraphs in \BE.
-
-Since neither Bembo nor Gill Sans are available in default \LaTeX{}
-installations, the \TL document classes default to using Palatino and
-Helvetica, respectively.  In addition, the Bera Mono typeface is used for
-\texttt{monospaced} type.
-
-The following font sizes are defined by the \TL classes:
-
-\begin{table}[h]\index{typefaces!sizes}
-  \footnotesize%
-  \begin{center}
-    \begin{tabular}{lccl}
-      \toprule
-      \LaTeX{} size & Font size & Leading & Used for \\
-      \midrule
-      \verb+\tiny+         &  5 &  6 & sidenote numbers \\
-      \verb+\scriptsize+   &  7 &  8 & --- \\
-      \verb+\footnotesize+ &  8 & 10 & sidenotes, captions \\
-      \verb+\small+        &  9 & 12 & quote, quotation, and verse environments \\
-      \verb+\normalsize+   & 10 & 14 & body text \\
-      \verb+\large+        & 11 & 15 & \textsc{b}-heads \\
-      \verb+\Large+        & 12 & 16 & \textsc{a}-heads, \textsc{toc} entries, author, date \\
-      \verb+\LARGE+        & 14 & 18 & handout title \\
-      \verb+\huge+         & 20 & 30 & chapter heads \\
-      \verb+\Huge+         & 24 & 36 & part titles \\
-      \bottomrule
-    \end{tabular}
-  \end{center}
-  \caption{A list of \LaTeX{} font sizes as defined by the \TL document classes.}
-  \label{tab:font-sizes}
-\end{table}
-
-\section{Headings}\label{sec:headings1}\index{headings}
-
-Tufte's books include the following heading levels: parts,
-chapters,\sidenote{Parts and chapters are defined for the \texttt{tufte\-book}
-class only.}  sections, subsections, and paragraphs.  Not defined by default
-are: sub-subsections and subparagraphs.
-
-\begin{table}[h]
-  \begin{center}
-    \footnotesize%
-    \begin{tabular}{lcr}
-      \toprule
-      Heading & Style & Size \\
-      \midrule
-      Part & roman & \measure{24}{36}{40} \\
-      Chapter & italic & \measure{20}{30}{40} \\
-      Section & italic & \measure{12}{16}{26} \\
-      Subsection & italic & \measure{11}{15}{26} \\
-      Paragraph & italic & 10/14 \\
-      \bottomrule
-    \end{tabular}
-  \end{center}
-  \caption{Heading styles used in \BE.}
-  \label{tab:heading-styles}
-\end{table}
-
-\paragraph{Paragraph} Paragraph headings (as shown here) are introduced by
-italicized text and separated from the main paragraph by a bit of space.
-
-\section{Environments}
-
-The following characteristics define the various environments:
-
-
-\begin{table}[h]
-  \begin{center}
-    \footnotesize%
-    \begin{tabular}{lcl}
-      \toprule
-      Environment & Font size & Notes \\
-      \midrule
-      Body text & \measure{10}{14}{26} & \\
-      Block quote & \measure{9}{12}{24} & Block indent (left and right) by \unit[1]{pc} \\
-      Sidenotes & \measure{8}{10}{12} & Sidenote number is set inline, followed by word space \\
-      Captions & \measure{8}{10}{12} &  \\
-      \bottomrule
-    \end{tabular}
-  \end{center}
-  \caption{Environment styles used in \BE.}
-  \label{tab:environment-styles}
-\end{table}
-
-
-\chapter{On the Use of the \texttt{tufte-book} Document Class}
-\label{ch:tufte-book}
-
-The Tufte-\LaTeX\ document classes define a style similar to the
-style Edward Tufte uses in his books and handouts.  Tufte's style is known
-for its extensive use of sidenotes, tight integration of graphics with
-text, and well-set typography.  This document aims to be at once a
-demonstration of the features of the Tufte-\LaTeX\ document classes
-and a style guide to their use.
-
-\section{Page Layout}\label{sec:page-layout}
-\subsection{Headings}\label{sec:headings}\index{headings}
-This style provides \textsc{a}- and \textsc{b}-heads (that is,
-\Verb|\section| and \Verb|\subsection|), demonstrated above.
-
-If you need more than two levels of section headings, you'll have to define
-them yourself at the moment; there are no pre-defined styles for anything below
-a \Verb|\subsection|.  As Bringhurst points out in \textit{The Elements of
-Typographic Style},\cite{Bringhurst2005} you should ``use as many levels of
-headings as you need: no more, and no fewer.''
-
-The Tufte-\LaTeX\ classes will emit an error if you try to use
-\linebreak\Verb|\subsubsection| and smaller headings.
-
-% let's start a new thought -- a new section
-\newthought{In his later books},\cite{Tufte2006} Tufte
-starts each section with a bit of vertical space, a non-indented paragraph,
-and sets the first few words of the sentence in \textsc{small caps}.  To
-accomplish this using this style, use the \hl{\doccmd{newthought}} command:
-\begin{docspec}
-  \doccmd{newthought}\{In his later books\}, Tufte starts\ldots
-\end{docspec}
-
-
-\section{Sidenotes}\label{sec:sidenotes}
-One of the most prominent and distinctive features of this style is the
-extensive use of sidenotes.  There is a wide margin to provide ample room
-for sidenotes and small figures.  Any \doccmd{footnote}s will automatically
-be converted to sidenotes.\footnote{This is a sidenote that was entered
-using the \texttt{\textbackslash footnote} command.}  If you'd like to place ancillary
-information in the margin without the sidenote mark (the superscript
-number), you can use the \hl{\doccmd{marginnote}} command.\marginnote{This is a
-margin note.  Notice that there isn't a number preceding the note, and
-there is no number in the main text where this note was written.}
-
-The specification of the \hl{\doccmd{sidenote}} command is:
-\begin{docspec}
-  \doccmd{sidenote}[\docopt{number}][\docopt{offset}]\{\docarg{Sidenote text.}\}
-\end{docspec}
-
-Both the \docopt{number} and \docopt{offset} arguments are optional.  If you
-provide a \docopt{number} argument, then that number will be used as the
-sidenote number.  It will change of the number of the current sidenote only and
-will not affect the numbering sequence of subsequent sidenotes.
-
-Sometimes a sidenote may run over the top of other text or graphics in the
-margin space.  If this happens, you can adjust the vertical position of the
-sidenote by providing a dimension in the \docopt{offset} argument.  Some
-examples of valid dimensions are:
-\begin{docspec}
-  \ttfamily 1.0in \qquad 2.54cm \qquad 254mm \qquad 6\Verb|\baselineskip|
-\end{docspec}
-If the dimension is positive it will push the sidenote down the page; if the
-dimension is negative, it will move the sidenote up the page.
-
-While both the \docopt{number} and \docopt{offset} arguments are optional, they
-must be provided in order.  To adjust the vertical position of the sidenote
-while leaving the sidenote number alone, use the following syntax:
-\begin{docspec}
-  \doccmd{sidenote}[][\docopt{offset}]\{\docarg{Sidenote text.}\}
-\end{docspec}
-The empty brackets tell the \Verb|\sidenote| command to use the default
-sidenote number.
-
-If you \emph{only} want to change the sidenote number, however, you may
-completely omit the \docopt{offset} argument:
-\begin{docspec}
-  \doccmd{sidenote}[\docopt{number}]\{\docarg{Sidenote text.}\}
-\end{docspec}
-
-The \doccmd{marginnote} command has a similar \docarg{offset} argument:
-\begin{docspec}
-  \doccmd{marginnote}[\docopt{offset}]\{\docarg{Margin note text.}\}
-\end{docspec}
-
-\section{References}
-References are placed alongside their citations as sidenotes,
-as well.  This can be accomplished using the normal \hl{\doccmd{cite}}
-command.\sidenote{The first paragraph of this document includes a citation.}
-
-The complete list of references may also be printed automatically by using
-the \hl{\doccmd{bibliography}} command.  (See the end of this document for an
-example.)  If you do not want to print a bibliography at the end of your
-document, use the \hl{\doccmd{nobibliography}} command in its place.  
-
-To enter multiple citations at one location,\cite[-3\baselineskip]{Tufte2006,Tufte1990} you can
-provide a list of keys separated by commas and the same optional vertical
-offset argument: \Verb|\cite{Tufte2006,Tufte1990}|.  
-\begin{docspec}
-  \doccmd{cite}[\docopt{offset}]\{\docarg{bibkey1,bibkey2,\ldots}\}
-\end{docspec}
-
-\section{Figures and Tables}\label{sec:figures-and-tables}
-Images and graphics play an integral role in Tufte's work.
-In addition to the standard \hl{\docenv{figure}} and \hl{\docenv{tabular}} environments,
-this style provides special figure and table environments for full-width
-floats.
-
-Full page--width figures and tables may be placed in \hl{\docenv{figure*}} or
-\hl{\docenv{table*}} environments.  To place figures or tables in the margin,
-use the \hl{\docenv{marginfigure}} or \hl{\docenv{margintable}} environments as follows
-(see figure~\ref{fig:marginfig}):
-
-\begin{marginfigure}%
-  \includegraphics[width=\linewidth]{helix}
-  \caption{This is a margin figure.  The helix is defined by 
-    $x = \cos(2\pi z)$, $y = \sin(2\pi z)$, and $z = [0, 2.7]$.  The figure was
-    drawn using Asymptote (\url{http://asymptote.sf.net/}).}
-  \label{fig:marginfig}
-\end{marginfigure}
-
-\begin{docspec}
-\textbackslash begin\{marginfigure\}\\
-  \qquad\textbackslash includegraphics\{helix\}\\
-  \qquad\textbackslash caption\{This is a margin figure.\}\\
-  \qquad\textbackslash label\{fig:marginfig\}\\
-\textbackslash end\{marginfigure\}\\
-\end{docspec}
-
-The \docenv{marginfigure} and \docenv{margintable} environments accept an optional parameter \docopt{offset} that adjusts the vertical position of the figure or table.  See the ``\nameref{sec:sidenotes}'' section above for examples.  The specifications are:
-\begin{docspec}
-  \textbackslash{begin\{marginfigure\}[\docopt{offset}]}\\
-  \qquad\ldots\\
-  \textbackslash{end\{marginfigure\}}\\
-  \mbox{}\\
-  \textbackslash{begin\{margintable\}[\docopt{offset}]}\\
-  \qquad\ldots\\
-  \textbackslash{end\{margintable\}}\\
-\end{docspec}
-
-Figure~\ref{fig:fullfig} is an example of the \docenv{figure*}
-environment and figure~\ref{fig:textfig} is an example of the normal
-\docenv{figure} environment.
-
-\begin{figure*}[h]
-  \includegraphics[width=\linewidth]{sine.pdf}%
-  \caption{This graph shows $y = \sin x$ from about $x = [-10, 10]$.
-  \emph{Notice that this figure takes up the full page width.}}%
-  \label{fig:fullfig}%
-\end{figure*}
-
-\begin{figure}
-  \includegraphics{hilbertcurves.pdf}
-%  \checkparity This is an \pageparity\ page.%
-  \caption{Hilbert curves of various degrees $n$.
-  \emph{Notice that this figure only takes up the main textblock width.}}
-  \label{fig:textfig}
-  %\zsavepos{pos:textfig}
-\end{figure}
-
-Table~\ref{tab:normaltab} shows table created with the \docpkg{booktabs}
-package.  Notice the lack of vertical rules---they serve only to clutter
-the table's data.
-
-\begin{table}[ht]
-  \centering
-  \fontfamily{ppl}\selectfont
-  \begin{tabular}{ll}
-    \toprule
-    Margin & Length \\
-    \midrule
-    Paper width & \unit[8\nicefrac{1}{2}]{inches} \\
-    Paper height & \unit[11]{inches} \\
-    Textblock width & \unit[6\nicefrac{1}{2}]{inches} \\
-    Textblock/sidenote gutter & \unit[\nicefrac{3}{8}]{inches} \\
-    Sidenote width & \unit[2]{inches} \\
-    \bottomrule
-  \end{tabular}
-  \caption{Here are the dimensions of the various margins used in the Tufte-handout class.}
-  \label{tab:normaltab}
-  %\zsavepos{pos:normaltab}
-\end{table}
-
-\section{Full-width text blocks}
-
-In addition to the new float types, there is a \hl{\docenv{fullwidth}}
-environment that stretches across the main text block and the sidenotes
-area.
-
-\begin{Verbatim}
-\begin{fullwidth}
-Lorem ipsum dolor sit amet...
-\end{fullwidth}
-\end{Verbatim}
-
-\begin{fullwidth}
-\small\itshape\lipsum[1]
-\end{fullwidth}
-
-\section{Typography}\label{sec:typography}
-
-\subsection{Typefaces}\label{sec:typefaces}\index{typefaces}
-If the Palatino, \textsf{Helvetica}, and \texttt{Bera Mono} typefaces are installed, this style
-will use them automatically.  Otherwise, we'll fall back on the Computer Modern
-typefaces.
-
-\subsection{Letterspacing}\label{sec:letterspacing}
-This document class includes two new commands and some improvements on
-existing commands for letterspacing.
-
-When setting strings of \allcaps{ALL CAPS} or \smallcaps{small caps}, the
-letter\-spacing---that is, the spacing between the letters---should be
-increased slightly.\cite{Bringhurst2005}  The \hl{\doccmd{allcaps}} command has proper letterspacing for
-strings of \allcaps{FULL CAPITAL LETTERS}, and the \hl{\doccmd{smallcaps}} command
-has letterspacing for \smallcaps{small capital letters}.  These commands
-will also automatically convert the case of the text to upper- or
-lowercase, respectively.
-
-The \hl{\doccmd{textsc}} command has also been redefined to include
-letterspacing.  The case of the \doccmd{textsc} argument is left as is,
-however.  This allows one to use both uppercase and lowercase letters:
-\textsc{The Initial Letters Of The Words In This Sentence Are Capitalized.}
-
-
-
-\section{Document Class Options}\label{sec:options}
-
-\index{class options|(}
-The \doccls{tufte-book} class is based on the \LaTeX\ \doccls{book}
-document class.  Therefore, you can pass any of the typical book
-options.  There are a few options that are specific to the
-\doccls{tufte-book} document class, however.
-
-The \hl{\docclsopt{a4paper}} option will set the paper size to \smallcaps{A4} instead of
-the default \smallcaps{US} letter size.
-
-The \hl{\docclsopt{sfsidenotes}} option will set the sidenotes and title block in a 
-\textsf{sans serif} typeface instead of the default roman.
-
-The \hl{\docclsopt{twoside}} option will modify the running heads so that the page
-number is printed on the outside edge (as opposed to always printing the page
-number on the right-side edge in \hl{\docclsopt{oneside}} mode).  
-
-The \hl{\docclsopt{symmetric}} option typesets the sidenotes on the outside edge of
-the page.  This is how books are traditionally printed, but is contrary to
-Tufte's book design which sets the sidenotes on the right side of the page.
-This option implicitly sets the \docclsopt{twoside} option.
-
-The \hl{\docclsopt{justified}} option sets all the text fully justified (flush left
-and right).  The default is to set the text ragged right.  
-The body text of Tufte's books are set ragged right.  This prevents
-needless hyphenation and makes it easier to read the text in the slightly
-narrower column.
-
-The \hl{\docclsopt{bidi}} option loads the \docpkg{bidi} package which is used with
-\tXeLaTeX\ to typeset bi-directional text.  Since the \docpkg{bidi}
-package needs to be loaded before the sidenotes and cite commands are defined,
-it can't be loaded in the document preamble.
-
-The \hl{\docclsopt{debug}} option causes the Tufte-\LaTeX\ classes to output debug
-information to the log file which is useful in troubleshooting bugs.  It will
-also cause the graphics to be replaced by outlines.
-
-The \hl{\docclsopt{nofonts}} option prevents the Tufte-\LaTeX\ classes from
-automatically loading the Palatino and Helvetica typefaces.  You should use
-this option if you wish to load your own fonts.  If you're using \tXeLaTeX, this
-option is implied (\ie, the Palatino and Helvetica fonts aren't loaded if you
-use \tXeLaTeX).  
-
-The \hl{\docclsopt{nols}} option inhibits the letterspacing code.  The Tufte-\LaTeX\
-classes try to load the appropriate letterspacing package (either pdf\TeX's
-\docpkg{letterspace} package or the \docpkg{soul} package).  If you're using
-\tXeLaTeX\ with \docpkg{fontenc}, however, you should configure your own
-letterspacing.  
-
-The \hl{\docclsopt{notitlepage}} option causes \verb|\maketitle| to generate a title
-block instead of a title page.  The \doccls{book} class defaults to a title
-page and the \doccls{handout} class defaults to the title block.  There is an
-analogous \hl{\docclsopt{titlepage}} option that forces \verb|\maketitle| to
-generate a full title page instead of the title block.
-
-The \hl{\docclsopt{notoc}} option suppresses Tufte-\LaTeX's custom table of contents
-(\textsc{toc}) design.  The current \textsc{toc} design only shows unnumbered
-chapter titles; it doesn't show sections or subsections.  The \docclsopt{notoc}
-option will revert to \LaTeX's \textsc{toc} design.
-
-\index{class options|)}
-
-
-\chapter{Debug Stuff}
-
-
-%%
-% The back matter contains appendices, bibliographies, indices, glossaries, etc.
-
-\backmatter
-
-
-
-\bibliography{sample-handout}
-\bibliographystyle{plainnat}
-
-
-\printindex
-
-\end{document}
-
diff --git a/Master/texmf-dist/source/latex/tufte-latex/sample-handout.bib b/Master/texmf-dist/source/latex/tufte-latex/sample-handout.bib
deleted file mode 100644
index 95e715e29ec..00000000000
--- a/Master/texmf-dist/source/latex/tufte-latex/sample-handout.bib
+++ /dev/null
@@ -1,57 +0,0 @@
-@BOOK{Tufte2006,
-	author = {Edward R. Tufte},
-	title = {Beautiful Evidence},
-	year = {2006},
-	publisher = {Graphics Press, {LLC}},
-	month = {May},
-	edition = {First},
-	place = {Cheshire, Connecticut},
-	isbn = {0-9613921-7-7}
-}
-
-@BOOK{Tufte2001,
-	author = {Edward R. Tufte},
-	title = {The Visual Display of Quantitative Information},
-	publisher = {Graphics Press},
-	year = {2001},
-	address = {Cheshire, Connecticut},
-	isbn = {0-9613921-4-2}
-}
-
-@BOOK{Tufte1990,
-	author = {Edward R. Tufte},
-	title = {Envisioning Information},
-	publisher = {Graphics Press},
-	year = {1990},
-	address = {Cheshire, Connecticut},
-	isbn = {0-9613921-1-8}
-}
-
-@BOOK{Tufte1997,
-	author = {Edward R. Tufte},
-	title = {Visual Explanations},
-	publisher = {Graphics Press},
-	year = {1997},
-	address = {Cheshire, Connecticut},
-	isbn = {0-9613921-2-6}
-}
-
-@BOOK{Bringhurst2005,
-	author = {Robert Bringhurst},
-	title = {The Elements of Typography},
-	publisher = {Hartley \& Marks},
-	year = {2005},
-	edition = {3.1},
-	isbn = {0-88179-205-5}
-}
-
-@BOOK{Mittelbach2004,
-	author = {Frank Mittelbach and Michel Goossens},
-	title = {The \LaTeX\ Companion},
-	publisher = {Addison--Wesley},
-	year = {2004},
-	edition = {Second},
-	isbn = {0-201-36299-6}
-}
-
-
diff --git a/Master/texmf-dist/source/latex/tufte-latex/sample-handout.pdf b/Master/texmf-dist/source/latex/tufte-latex/sample-handout.pdf
deleted file mode 100644
index 457890656de..00000000000
--- a/Master/texmf-dist/source/latex/tufte-latex/sample-handout.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/latex/tufte-latex/sample-handout.tex b/Master/texmf-dist/source/latex/tufte-latex/sample-handout.tex
deleted file mode 100644
index 3d8309f9f7e..00000000000
--- a/Master/texmf-dist/source/latex/tufte-latex/sample-handout.tex
+++ /dev/null
@@ -1,382 +0,0 @@
-\documentclass{tufte-handout}
-
-%\geometry{showframe}% for debugging purposes -- displays the margins
-
-\usepackage{amsmath}
-
-% Set up the images/graphics package
-\usepackage{graphicx}
-\setkeys{Gin}{width=\linewidth,totalheight=\textheight,keepaspectratio}
-\graphicspath{{graphics/}}
-
-\title{An Example of the Usage of the Tufte-Handout Style\thanks{Inspired by Edward~R. Tufte!}}
-\author[The Tufte-LaTeX Developers]{The Tufte-\LaTeX\ Developers}
-\date{24 January 2009}  % if the \date{} command is left out, the current date will be used
-
-% The following package makes prettier tables.  We're all about the bling!
-\usepackage{booktabs}
-
-% The units package provides nice, non-stacked fractions and better spacing
-% for units.
-\usepackage{units}
-
-% The fancyvrb package lets us customize the formatting of verbatim
-% environments.  We use a slightly smaller font.
-\usepackage{fancyvrb}
-\fvset{fontsize=\normalsize}
-
-% Small sections of multiple columns
-\usepackage{multicol}
-
-% Provides paragraphs of dummy text
-\usepackage{lipsum}
-
-% These commands are used to pretty-print LaTeX commands
-\newcommand{\doccmd}[1]{\texttt{\textbackslash#1}}% command name -- adds backslash automatically
-\newcommand{\docopt}[1]{\ensuremath{\langle}\textrm{\textit{#1}}\ensuremath{\rangle}}% optional command argument
-\newcommand{\docarg}[1]{\textrm{\textit{#1}}}% (required) command argument
-\newenvironment{docspec}{\begin{quote}\noindent}{\end{quote}}% command specification environment
-\newcommand{\docenv}[1]{\textsf{#1}}% environment name
-\newcommand{\docpkg}[1]{\texttt{#1}}% package name
-\newcommand{\doccls}[1]{\texttt{#1}}% document class name
-\newcommand{\docclsopt}[1]{\texttt{#1}}% document class option name
-
-\begin{document}
-
-\maketitle% this prints the handout title, author, and date
-
-\begin{abstract}
-\noindent This document describes the Tufte handout \LaTeX\ document style.
-It also provides examples and comments on the style's use.
-\end{abstract}
-
-%\printclassoptions
-
-The Tufte-\LaTeX\ document classes define a style similar to the
-style Edward Tufte uses in his books and handouts.  Tufte's style is known
-for its extensive use of sidenotes, tight integration of graphics with
-text, and well-set typography.  This document aims to be at once a
-demonstration of the features of the Tufte-\LaTeX\ document classes
-and a style guide to their use.
-
-\section{Page Layout}\label{sec:page-layout}
-\subsection{Headings}\label{sec:headings}
-This style provides \textsc{a}- and \textsc{b}-heads (that is,
-\Verb|\section| and \Verb|\subsection|), demonstrated above.
-
-If you need more than two levels of section headings, you'll have to define
-them yourself at the moment;\sidenote{See see ``\nameref{sec:defining-sections}'' on
-page~\pageref{sec:defining-sections} for help with defining more heading
-levels.} there are no pre-defined styles for anything below a
-\Verb|\subsection|.  As Bringhurst points out in \textit{The Elements of
-Typographic Style},\cite{Bringhurst2005} you should ``use as many levels of
-headings as you need: no more, and no fewer.''
-
-The Tufte-\LaTeX\ classes will emit an error if you try to use
-\linebreak\Verb|\subsubsection| and smaller headings.
-
-%\medskip
-%\begin{fullwidth}
-%\begin{Verbatim}
-%! Package tufte-handout Error: \subsubsection is undefined by this class.
-%(tufte-handout)                See Robert Bringhurst's _The Elements of 
-%(tufte-handout)                Typographic Style_, section 4.2.2. 
-%(tufte-handout)                \subsubsection was used.
-%\end{Verbatim}
-%\end{fullwidth}
-%\medskip
-
-% let's start a new thought -- a new section
-\newthought{In his later books},\cite{Tufte2006} Tufte
-starts each section with a bit of vertical space, a non-indented paragraph,
-and sets the first few words of the sentence in \textsc{small caps}.  To
-accomplish this using this style, use the \Verb|\newthought| command:  
-\begin{docspec}
-  \doccmd{newthought\{In his later books\}, Tufte starts\ldots}
-\end{docspec}
-
-\subsection{Sidenotes}\label{sec:sidenotes}
-One of the most prominent and distinctive features of this style is the
-extensive use of sidenotes.  There is a wide margin to provide ample room
-for sidenotes and small figures.  Any \Verb|\footnote|s will automatically
-be converted to sidenotes.\footnote{This is a sidenote that was entered
-using the \texttt{\textbackslash footnote} command.}  If you'd like to place ancillary
-information in the margin without the sidenote mark (the superscript
-number), you can use the \Verb|\marginnote| command.\marginnote{This is a
-margin note.  Notice that there isn't a number preceding the note, and
-there is no number in the main text where this note was written.}
-
-The specification of the \Verb|\sidenote| command is:
-\begin{docspec}
-  \doccmd{sidenote[\docopt{number}][\docopt{offset}]\{\docarg{Sidenote text.}\}}
-\end{docspec}
-
-Both the \docopt{number} and \docopt{offset} arguments are optional.  If you
-provide a \docopt{number} argument, then that number will be used as the
-sidenote number.  It will change of the number of the current sidenote only and
-will not affect the numbering sequence of subsequent sidenotes.
-
-Sometimes a sidenote may run over the top of other text or graphics in the
-margin space.  If this happens, you can adjust the vertical position of the
-sidenote by providing a dimension in the \docopt{offset} argument.  Some
-examples of valid dimensions are:
-\begin{docspec}
-  \ttfamily 1.0in \qquad 2.54cm \qquad 254mm \qquad 6\Verb|\baselineskip|
-\end{docspec}
-If the dimension is positive it will push the sidenote down the page; if the
-dimension is negative, it will move the sidenote up the page.
-
-While both the \docopt{number} and \docopt{offset} arguments are optional, they
-must be provided in order.  To adjust the vertical position of the sidenote
-while leaving the sidenote number alone, use the following syntax:
-\begin{docspec}
-  \doccmd{sidenote[][\docopt{offset}]\{\docarg{Sidenote text.}\}}
-\end{docspec}
-The empty brackets tell the \Verb|\sidenote| command to use the default
-sidenote number.
-
-If you \emph{only} want to change the sidenote number, however, you may
-completely omit the \docopt{offset} argument:
-\begin{docspec}
-  \doccmd{sidenote[\docopt{number}]\{\docarg{Sidenote text.}\}}
-\end{docspec}
-
-The \Verb|\marginnote| command has a similar \docarg{offset} argument:
-\begin{docspec}
-  \doccmd{marginnote[\docopt{offset}]\{\docarg{Margin note text.}\}}
-\end{docspec}
-
-\subsection{References}
-References are placed alongside their citations as sidenotes,
-as well.  This can be accomplished using the normal \Verb|\cite|
-command.\sidenote{The first paragraph of this document includes a citation.}
-
-The complete list of references may also be printed automatically by using
-the \Verb|\bibliography| command.  (See the end of this document for an
-example.)  If you do not want to print a bibliography at the end of your
-document, use the \Verb|\nobibliography| command in its place.  
-
-To enter multiple citations at one location,\cite[-3\baselineskip]{Tufte2006,Tufte1990} you can
-provide a list of keys separated by commas and the same optional vertical
-offset argument: \Verb|\cite{Tufte2006,Tufte1990}|.  
-\begin{docspec}
-  \doccmd{cite[\docopt{offset}]\{\docarg{bibkey1,bibkey2,\ldots}\}}
-\end{docspec}
-
-\section{Figures and Tables}\label{sec:figures-and-tables}
-Images and graphics play an integral role in Tufte's work.
-In addition to the standard \docenv{figure} and \docenv{tabular} environments,
-this style provides special figure and table environments for full-width
-floats.
-
-Full page--width figures and tables may be placed in \docenv{figure*} or
-\docenv{table*} environments.  To place figures or tables in the margin,
-use the \docenv{marginfigure} or \docenv{margintable} environments as follows
-(see figure~\ref{fig:marginfig}):
-
-\begin{marginfigure}%
-  \includegraphics[width=\linewidth]{helix}
-  \caption{This is a margin figure.  The helix is defined by 
-    $x = \cos(2\pi z)$, $y = \sin(2\pi z)$, and $z = [0, 2.7]$.  The figure was
-    drawn using Asymptote (\url{http://asymptote.sf.net/}).}
-  \label{fig:marginfig}
-\end{marginfigure}
-\begin{Verbatim}
-\begin{marginfigure}
-  \includegraphics{helix}
-  \caption{This is a margin figure.}
-\end{marginfigure}
-\end{Verbatim}
-
-The \docenv{marginfigure} and \docenv{margintable} environments accept an optional parameter \docopt{offset} that adjusts the vertical position of the figure or table.  See the ``\nameref{sec:sidenotes}'' section above for examples.  The specifications are:
-\begin{docspec}
-  \doccmd{begin\{marginfigure\}[\docopt{offset}]}\\
-  \qquad\ldots\\
-  \doccmd{end\{marginfigure\}}\\
-  \mbox{}\\
-  \doccmd{begin\{margintable\}[\docopt{offset}]}\\
-  \qquad\ldots\\
-  \doccmd{end\{margintable\}}\\
-\end{docspec}
-
-Figure~\ref{fig:fullfig} is an example of the \Verb|figure*|
-environment and figure~\ref{fig:textfig} is an example of the normal
-\Verb|figure| environment.
-
-\begin{figure*}[h]
-  \includegraphics[width=\linewidth]{sine.pdf}%
-  \caption{This graph shows $y = \sin x$ from about $x = [-10, 10]$.
-  \emph{Notice that this figure takes up the full page width.}}%
-  \label{fig:fullfig}%
-\end{figure*}
-
-\begin{figure}
-  \includegraphics{hilbertcurves.pdf}
-%  \checkparity This is an \pageparity\ page.%
-  \caption{Hilbert curves of various degrees $n$.
-  \emph{Notice that this figure only takes up the main textblock width.}}
-  \label{fig:textfig}
-  %\zsavepos{pos:textfig}
-\end{figure}
-
-Table~\ref{tab:normaltab} shows table created with the \docpkg{booktabs}
-package.  Notice the lack of vertical rules---they serve only to clutter
-the table's data.
-
-\begin{table}[ht]
-  \centering
-  \fontfamily{ppl}\selectfont
-  \begin{tabular}{ll}
-    \toprule
-    Margin & Length \\
-    \midrule
-    Paper width & \unit[8\nicefrac{1}{2}]{inches} \\
-    Paper height & \unit[11]{inches} \\
-    Textblock width & \unit[6\nicefrac{1}{2}]{inches} \\
-    Textblock/sidenote gutter & \unit[\nicefrac{3}{8}]{inches} \\
-    Sidenote width & \unit[2]{inches} \\
-    \bottomrule
-  \end{tabular}
-  \caption{Here are the dimensions of the various margins used in the Tufte-handout class.}
-  \label{tab:normaltab}
-  %\zsavepos{pos:normaltab}
-\end{table}
-
-\section{Full-width text blocks}
-
-In addition to the new float types, there is a \docenv{fullwidth}
-environment that stretches across the main text block and the sidenotes
-area.
-
-\begin{Verbatim}
-\begin{fullwidth}
-Lorem ipsum dolor sit amet...
-\end{fullwidth}
-\end{Verbatim}
-
-\begin{fullwidth}
-\small\itshape\lipsum[1]
-\end{fullwidth}
-
-\section{Typography}\label{sec:typography}
-
-\subsection{Typefaces}\label{sec:typefaces}
-If the Palatino, \textsf{Helvetica}, and \texttt{Bera Mono} typefaces are installed, this style
-will use them automatically.  Otherwise, we'll fall back on the Computer Modern
-typefaces.
-
-\subsection{Letterspacing}\label{sec:letterspacing}
-This document class includes two new commands and some improvements on
-existing commands for letterspacing.
-
-When setting strings of \allcaps{ALL CAPS} or \smallcaps{small caps}, the
-letter\-spacing---that is, the spacing between the letters---should be
-increased slightly.\cite{Bringhurst2005}  The \Verb|\allcaps| command has proper letterspacing for
-strings of \allcaps{FULL CAPITAL LETTERS}, and the \Verb|\smallcaps| command
-has letterspacing for \smallcaps{small capital letters}.  These commands
-will also automatically convert the case of the text to upper- or
-lowercase, respectively.
-
-The \Verb|\textsc| command has also been redefined to include
-letterspacing.  The case of the \Verb|\textsc| argument is left as is,
-however.  This allows one to use both uppercase and lowercase letters:
-\textsc{The Initial Letters Of The Words In This Sentence Are Capitalized.}
-
-
-\section{Customization}\label{sec:customization}
-\subsection{Document class options}\label{sec:options}
-The \doccls{tufte-handout} class is based on the \LaTeX\ \doccls{article}
-document class.  Therefore, you can pass any of the typical article
-options.  There are a few options that are specific to the
-\doccls{tufte-handout} document class, however.
-
-The \docclsopt{a4paper} option will set the paper size to \smallcaps{A4} instead of
-the default \smallcaps{US} letter size.
-
-The \docclsopt{sfsidenotes} option will set the sidenotes and title block in a 
-\textsf{sans serif} typeface instead of the default roman.
-
-The \docclsopt{twoside} option will modify the running heads so that the page
-number is printed on the outside edge (as opposed to always printing the page
-number on the right-side edge in \docclsopt{oneside} mode).  
-
-The \docclsopt{symmetric} option typesets the sidenotes on the outside edge of
-the page.  This is how books are traditionally printed, but is contrary to
-Tufte's book design which sets the sidenotes on the right side of the page.
-This option implicitly sets the \docclsopt{twoside} option.
-
-The \docclsopt{justified} option sets all the text fully justified (flush left
-and right).  The default is to set the text ragged right.  
-The body text of Tufte's books are set ragged right.  This prevents
-needless hyphenation and makes it easier to read the text in the slightly
-narrower column.
-
-\subsection{Defining new sections}\label{sec:defining-sections}
-As mentioned in the ``\nameref{sec:headings}'' section (see
-page~\pageref{sec:headings}), the \doccls{tufte\-handout} document class only
-defines \doccmd{section} and \doccmd{subsection} headings.  
-
-We use the \docpkg{titlesec} package to define the appearance of the headings.
-To modify an existing section or to add a new section, see the documentation of
-the \docpkg{titlesec} package.
-
-
-\section{Installation}\label{sec:installation}
-To install the Tufte-\LaTeX\ classes, simply drop the
-following files into the same directory as your \texttt{.tex}
-file:
-\begin{quote}
-  \ttfamily
-  tufte-common.sty\\
-  tufte-handout.cls\\
-  tufte-book.cls
-\end{quote}
-
-% TODO add instructions for installing it globally
-
-
-\section{Support}\label{sec:support}
-
-\subsection{Package Dependencies}\label{sec:dependencies}
-The following is a list of packages that the Tufte-\LaTeX\ document
-classes rely upon.  Packages marked with an asterisk are optional.
-\begin{multicols}{2}
-\begin{itemize}
-  \item xifthen
-  \item ifpdf*
-  \item ifxetex*
-  \item hyperref
-  \item geometry
-  \item ragged2e
-  \item chngpage \emph{or} changepage
-  \item paralist
-  \item textcase
-  \item soul*
-  \item letterspace*
-  \item setspace
-  \item natbib \emph{and} bibentry
-  \item optparams
-  \item placeins
-  \item mathpazo*
-  \item helvet*
-  \item fontenc
-  \item beramono*
-  \item fancyhdr
-  \item xcolor
-  \item textcomp
-  \item titlesec
-  \item titletoc
-\end{itemize}
-\end{multicols}
-
-\subsection{Tufte-\LaTeX\ Website}\label{sec:website}
-The website for the Tufte-\LaTeX\ packages is located at
-\url{http://code.google.com/p/tufte-latex/}.  On our website, you'll find
-links to our \smallcaps{svn} repository, mailing lists, bug tracker, and documentation.
-
-\bibliography{sample-handout}
-\bibliographystyle{plainnat}
-
-
-
-\end{document}
diff --git a/Master/texmf-dist/source/latex/tufte-latex/tufte-book.cls b/Master/texmf-dist/source/latex/tufte-latex/tufte-book.cls
deleted file mode 100644
index 99ff6dfa219..00000000000
--- a/Master/texmf-dist/source/latex/tufte-latex/tufte-book.cls
+++ /dev/null
@@ -1,83 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-
-\ProvidesClass{tufte-book}[2009/05/17 v3.0.0 Tufte-book class]
-
-
-\PassOptionsToPackage{book}{tufte-common}
-\DeclareOption*{% pass options to tufte-common package and the article class
-  \PassOptionsToPackage{\CurrentOption}{tufte-common}
-  \PassOptionsToClass{\CurrentOption}{book}
-  \PackageInfo{tufte-book}{Passing \CurrentOption\space to `book' class}
-}
-\ProcessOptions
-
-\LoadClass{book}
-
-\RequirePackage{tufte-common}
-
-
-%%
-% Set up any book-specific stuff now
-
-%%
-% The front matter in Tufte's /Beautiful Evidence/ contains everything up
-% to the opening page of Chapter 1.  The running heads, when they appear,
-% contain only the (arabic) page number in the outside corner.
-%\newif\if@mainmatter \@mainmattertrue
-\renewcommand\frontmatter{%
-  \cleardoublepage%
-  \@mainmatterfalse%
-  \pagenumbering{arabic}%
-  %\pagestyle{plain}%
-  \fancyhf{}%
-  \ifthenelse{\boolean{@tufte@twoside}}%
-    {\fancyhead[LE,RO]{\thepage}}%
-    {\fancyhead[RE,RO]{\thepage}}%
-}
-
-
-%%
-% The main matter in Tufte's /Beautiful Evidence/ doesn't restart the page
-% numbering---it continues where it left off in the front matter.
-\renewcommand\mainmatter{%
-  \cleardoublepage%
-  \@mainmattertrue%
-  \fancyhf{}%
-  \ifthenelse{\boolean{@tufte@twoside}}%
-    {% two-side
-      \renewcommand{\chaptermark}[1]{\markboth{##1}{}}%
-      \fancyhead[LE]{\thepage\quad\smallcaps{\plaintitle}}% book title
-      \fancyhead[RO]{\smallcaps{\leftmark}\quad\thepage}% chapter title
-    }%
-    {% one-side
-      \fancyhead[RE,RO]{\smallcaps{\plaintitle}\quad\thepage}% book title
-    }%
-}
-
-
-%%
-% The back matter contains appendices, indices, glossaries, endnotes,
-% biliographies, list of contributors, illustration credits, etc.
-\renewcommand\backmatter{%
-  \if@openright%
-    \cleardoublepage%
-  \else%
-    \clearpage%
-  \fi%
-  \@mainmatterfalse%
-}
-
-%%
-% Only show the chapter titles in the table of contents
-\setcounter{tocdepth}{0}
-
-%%
-% If there is a `tufte-book-local.sty' file, load it.
-
-\IfFileExists{tufte-book-local.tex}
-  {\input{tufte-book-local}}
-  {}
-
-%%
-% End of file
-\endinput
diff --git a/Master/texmf-dist/source/latex/tufte-latex/tufte-handout.cls b/Master/texmf-dist/source/latex/tufte-latex/tufte-handout.cls
deleted file mode 100644
index ca9ab630829..00000000000
--- a/Master/texmf-dist/source/latex/tufte-latex/tufte-handout.cls
+++ /dev/null
@@ -1,50 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-
-\ProvidesClass{tufte-handout}[2009/05/17 v3.0.0 Tufte-handout class]
-
-%%
-% The symmetric option forces twoside.
-\DeclareOption{symmetric}{%
-  \ExecuteOptions{twoside}
-  \PassOptionsToPackage{twoside}{tufte-common}
-  \PassOptionsToClass{twoside}{article}
-  \PackageInfo{tufte-handout}{Passing twoside to `article' class}
-}
-
-\PassOptionsToPackage{handout}{tufte-common}
-\DeclareOption*{% pass options to tufte-common package and the article class
-  \PassOptionsToPackage{\CurrentOption}{tufte-common}
-  \PassOptionsToClass{\CurrentOption}{article}
-  \PackageInfo{tufte-handout}{Passing \CurrentOption\space to `article' class}
-}
-\ProcessOptions
-
-\LoadClass{article}
-
-\RequirePackage{tufte-common}
-
-
-%%
-% Set up any handout-specific stuff now
-
-%%
-% Abstract
-
-% TODO The abstract should be printed on its own page of the `titlepage'
-% option was specified.
-\renewenvironment{abstract}
-  {\begin{quotation}\if@tufte@sfsidenotes\begin{sffamily}\fi}
-  {\if@tufte@sfsidenotes\end{sffamily}\fi\end{quotation}}
-
-
-%%
-% If there is a `tufte-handout-local.tex' file, load it.
-
-\IfFileExists{tufte-handout-local.tex}
-  {\input{tufte-handout-local}}
-  {}
-
-
-%%
-% End of file
-\endinput
diff --git a/Master/texmf-dist/tex/latex/tufte-latex/tufte-book.cls b/Master/texmf-dist/tex/latex/tufte-latex/tufte-book.cls
index 99ff6dfa219..11d50157b0b 100644
--- a/Master/texmf-dist/tex/latex/tufte-latex/tufte-book.cls
+++ b/Master/texmf-dist/tex/latex/tufte-latex/tufte-book.cls
@@ -1,19 +1,15 @@
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
 
-\ProvidesClass{tufte-book}[2009/05/17 v3.0.0 Tufte-book class]
+\ProvidesClass{tufte-book}[2009/12/11 v3.5.0 Tufte-book class]
 
+%%
+% Declare we're tufte-book
+\newcommand{\@tufte@class}{book}% the base LaTeX class (defaults to the article/handout style)
+\newcommand{\@tufte@pkgname}{tufte-book}% the name of the package (defaults to tufte-handout)
 
-\PassOptionsToPackage{book}{tufte-common}
-\DeclareOption*{% pass options to tufte-common package and the article class
-  \PassOptionsToPackage{\CurrentOption}{tufte-common}
-  \PassOptionsToClass{\CurrentOption}{book}
-  \PackageInfo{tufte-book}{Passing \CurrentOption\space to `book' class}
-}
-\ProcessOptions
-
-\LoadClass{book}
-
-\RequirePackage{tufte-common}
+%%
+% Load the common style elements
+\input{tufte-common.def}
 
 
 %%
@@ -46,11 +42,11 @@
   \ifthenelse{\boolean{@tufte@twoside}}%
     {% two-side
       \renewcommand{\chaptermark}[1]{\markboth{##1}{}}%
-      \fancyhead[LE]{\thepage\quad\smallcaps{\plaintitle}}% book title
-      \fancyhead[RO]{\smallcaps{\leftmark}\quad\thepage}% chapter title
+      \fancyhead[LE]{\thepage\quad\smallcaps{\newlinetospace{\plaintitle}}}% book title
+      \fancyhead[RO]{\smallcaps{\newlinetospace{\leftmark}}\quad\thepage}% chapter title
     }%
     {% one-side
-      \fancyhead[RE,RO]{\smallcaps{\plaintitle}\quad\thepage}% book title
+      \fancyhead[RE,RO]{\smallcaps{\newlinetospace{\plaintitle}}\quad\thepage}% book title
     }%
 }
 
@@ -75,7 +71,8 @@
 % If there is a `tufte-book-local.sty' file, load it.
 
 \IfFileExists{tufte-book-local.tex}
-  {\input{tufte-book-local}}
+  {\input{tufte-book-local}
+   \TufteInfoNL{Loading tufte-book-local.tex}}
   {}
 
 %%
diff --git a/Master/texmf-dist/source/latex/tufte-latex/tufte-common.sty b/Master/texmf-dist/tex/latex/tufte-latex/tufte-common.def
index 5fb331085f0..f71cc52b253 100644
--- a/Master/texmf-dist/source/latex/tufte-latex/tufte-common.sty
+++ b/Master/texmf-dist/tex/latex/tufte-latex/tufte-common.def
@@ -1,114 +1,252 @@
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
+%%
+%% This file contains the code that's common to the Tufte-LaTeX document classes.
+%%
 
-\ProvidesPackage{tufte-common}[2009/05/17 v3.0.0 Common code for the Tufte-LaTeX styles]
+\ProvidesFile{tufte-common.def}[2009/12/11 v3.5.0 Common code for the Tufte-LaTeX styles]
+
+%%
+% The `xkeyval' package simplifies the user interface for the document class options
+\RequirePackage{xkeyval}
 
 %%
 % We use the `xifthen' package to handle our package option switches
 \RequirePackage{xifthen}
 
+%%
+% Define some shortcut macros for error/warning/info logging.
+
+\newcommand{\TufteWarning}[1]{\ClassWarning{\@tufte@pkgname}{#1}}
+\newcommand{\TufteWarningNL}[1]{\ClassWarningNoLine{\@tufte@pkgname}{#1}}
+\newcommand{\TufteInfo}[1]{\ClassInfo{\@tufte@pkgname}{#1}}
+\newcommand{\TufteInfoNL}[1]{\ClassInfo{\@tufte@pkgname}{#1\@gobble}}
+\newcommand{\TufteDebugInfo}[1]{\ifthenelse{\boolean{@tufte@debug}}{\TufteInfo{#1}}{}}
+\newcommand{\TufteDebugInfoNL}[1]{\ifthenelse{\boolean{@tufte@debug}}{\TufteInfoNL{#1}}{}}
+\newcommand{\TufteError}[2]{\ClassError{\@tufte@pkgname}{#1}{#2}}
 
 %%
 % `debug' option -- provides more information in the .log file for use in
 % troubleshooting problems
 \newboolean{@tufte@debug}
-\DeclareOption{debug}{\setboolean{@tufte@debug}{true}}
+\DeclareOptionX[tufte]<common>{debug}{\setboolean{@tufte@debug}{true}}
 
 %%
 % `nofonts' option -- doesn't load any fonts
 % `fonts' option -- tries to load fonts
 \newboolean{@tufte@loadfonts}\setboolean{@tufte@loadfonts}{true}
-\DeclareOption{fonts}{\setboolean{@tufte@loadfonts}{true}}
-\DeclareOption{nofonts}{\setboolean{@tufte@loadfonts}{false}}
+\DeclareOptionX[tufte]<common>{fonts}{\setboolean{@tufte@loadfonts}{true}}
+\DeclareOptionX[tufte]<common>{nofonts}{\setboolean{@tufte@loadfonts}{false}}
 
 %%
 % `nols' option -- doesn't configure letterspacing
 % `ls' option -- configures letterspacing
 \newboolean{@tufte@letterspace}\setboolean{@tufte@letterspace}{true}
-\DeclareOption{ls}{\setboolean{@tufte@letterspace}{true}}
-\DeclareOption{nols}{\setboolean{@tufte@letterspace}{false}}
-
-%%
-% `book' and `handout' options
-\newcommand{\@tufte@class}{article}% the base LaTeX class (defaults to the article/handout style)
-\newcommand{\@tufte@pkgname}{tufte-handout}% the name of the package (defaults to tufte-handout)
-\DeclareOption{book}{%
-  \renewcommand{\@tufte@class}{book}
-  \renewcommand{\@tufte@pkgname}{tufte-book}
-  \setboolean{@tufte@titlepage}{true}
-}
-\DeclareOption{handout}{%
-  \renewcommand{\@tufte@class}{article}
-  \renewcommand{\@tufte@pkgname}{tufte-handout}
-  \setboolean{@tufte@titlepage}{false}
-}
-\DeclareOption{article}{% `article' is just an alias for `handout'
-  \renewcommand{\@tufte@class}{article}
-  \renewcommand{\@tufte@pkgname}{tufte-handout}
-  \setboolean{@tufte@titlepage}{false}
-}
+\DeclareOptionX[tufte]<common>{ls}{\setboolean{@tufte@letterspace}{true}}
+\DeclareOptionX[tufte]<common>{nols}{\setboolean{@tufte@letterspace}{false}}
 
 %%
 % `titlepage' option -- creates a full title page with \maketitle
 
 \newboolean{@tufte@titlepage}
-\DeclareOption{titlepage}{\setboolean{@tufte@titlepage}{true}}
-\DeclareOption{notitlepage}{\setboolean{@tufte@titlepage}{false}}
+\DeclareOptionX[tufte]<common>{titlepage}{\setboolean{@tufte@titlepage}{true}}
+\DeclareOptionX[tufte]<common>{notitlepage}{\setboolean{@tufte@titlepage}{false}}
 
 %%
 % `a4paper' option
 
 \newboolean{@tufte@afourpaper}
-\DeclareOption{a4paper}{\setboolean{@tufte@afourpaper}{true}}
+\DeclareOptionX[tufte]<common>{a4paper}{\setboolean{@tufte@afourpaper}{true}}
+
+%%
+% `b5paper' option
+
+\newboolean{@tufte@bfivepaper}
+\DeclareOptionX[tufte]<common>{b5paper}{\setboolean{@tufte@bfivepaper}{true}}
 
 %%
 % `sfsidenotes' option -- typesets sidenotes in sans serif typeface
 
 \newboolean{@tufte@sfsidenotes}
-\DeclareOption{sfsidenotes}{\setboolean{@tufte@sfsidenotes}{true}}
+\DeclareOptionX[tufte]<common>{sfsidenotes}{\setboolean{@tufte@sfsidenotes}{true}}
 
 %%
 % `symmetric' option -- puts marginpar space to the outside edge of the page
 %   Note: this option forces the twoside option (see the .cls files)
 
 \newboolean{@tufte@symmetric}
-\DeclareOption{symmetric}{
+\DeclareOptionX[tufte]<common>{symmetric}{
   \setboolean{@tufte@symmetric}{true}
-  \PackageInfo{\@tufte@pkgname}{The `symmetric' option implies `twoside'}
-  %\ExecuteOptions{twoside}
+  \TufteInfoNL{The `symmetric' option implies `twoside'}
+  \ExecuteOptionsX[tufte]<common>{twoside}
 }
 
 %%
 % `twoside' option -- alternates running heads
 
 \newboolean{@tufte@twoside}
-\DeclareOption{twoside}{\setboolean{@tufte@twoside}{true}}
+\DeclareOptionX[tufte]<common>{twoside}{%
+  \setboolean{@tufte@twoside}{true}
+  \TufteInfoNL{Passing the `twoside' option to the `\@tufte@class' class}
+  \PassOptionsToClass{twoside}{\@tufte@class}
+}
 
 %%
 % `notoc' option -- suppresses the Tufte-style table of contents
 
 \newboolean{@tufte@toc}
 \setboolean{@tufte@toc}{true}
-\DeclareOption{notoc}{\setboolean{@tufte@toc}{false}}
-\DeclareOption{toc}{\setboolean{@tufte@toc}{true}}
+\DeclareOptionX[tufte]<common>{notoc}{\setboolean{@tufte@toc}{false}}
+\DeclareOptionX[tufte]<common>{toc}{\setboolean{@tufte@toc}{true}}
 
 %%
 % `justified' option -- uses fully justified text (flush left and flush
 % right) instead of ragged right.
 
 \newboolean{@tufte@justified}
-\DeclareOption{justified}{\setboolean{@tufte@justified}{true}}
+\DeclareOptionX[tufte]<common>{justified}{\setboolean{@tufte@justified}{true}}
 
 %%
 % `bidi' option -- loads the bidi package for bi-directional text
 
 \newboolean{@tufte@loadbidi}
-\DeclareOption{bidi}{\setboolean{@tufte@loadbidi}{true}}
-\DeclareOption{nobidi}{\setboolean{@tufte@loadbibi}{false}}
+\DeclareOptionX[tufte]<common>{bidi}{\setboolean{@tufte@loadbidi}{true}}
+\DeclareOptionX[tufte]<common>{nobidi}{\setboolean{@tufte@loadbidi}{false}}
+
+%%
+% `nohyper' option -- suppresses loading of the hyperref package
+
+\newboolean{@tufte@loadhyper}
+\setboolean{@tufte@loadhyper}{true}
+\DeclareOptionX[tufte]<common>{hyper}{\setboolean{@tufte@loadhyper}{true}}
+\DeclareOptionX[tufte]<common>{nohyper}{\setboolean{@tufte@loadhyper}{false}}
+
+%%
+% `sidenote', `marginnote', `caption', `citation', `marginals' options
+% Each allows one of {justified,raggedleft,raggedright,raggedouter,auto}.
+
+\newcommand*{\@tufte@sidenote@justification}{\@tufte@justification@autodetect}
+\define@choicekey*+[tufte]{common}{sidenote}[\@tufte@kvtext\@tufte@kvnum]{justified,raggedleft,raggedright,raggedouter,auto}[auto]{%
+  \ifcase\@tufte@kvnum\relax
+    \renewcommand*{\@tufte@sidenote@justification}{\justifying}% justified
+  \or
+    \renewcommand*{\@tufte@sidenote@justification}{\RaggedLeft}% ragged left
+  \or
+    \renewcommand*{\@tufte@sidenote@justification}{\RaggedRight}% ragged right
+  \or
+    \renewcommand*{\@tufte@sidenote@justification}{\@tufte@justification@outer}% ragged outer (flush right on verso pages, flush left on recto pages)
+  \or
+    \renewcommand*{\@tufte@sidenote@justification}{\@tufte@justification@autodetect}% autodetects best justification mode based on all class options
+  \fi
+}{%
+  \TufteWarningNL{Invalid option `#1' for sidenote key.\MessageBreak Must be one of: justified, raggedleft,\MessageBreak raggedright, raggedouter, auto}
+  \renewcommand*{\@tufte@sidenote@justification}{\@tufte@justification@autodetect}% autodetects best justification mode based on all class options
+}
+
+\newcommand*{\@tufte@marginnote@justification}{\@tufte@justification@autodetect}
+\define@choicekey*+[tufte]{common}{marginnote}[\@tufte@kvtext\@tufte@kvnum]{justified,raggedleft,raggedright,raggedouter,auto}[auto]{%
+  \ifcase\@tufte@kvnum\relax
+    \renewcommand*{\@tufte@marginnote@justification}{\justifying}% justified
+  \or
+    \renewcommand*{\@tufte@marginnote@justification}{\RaggedLeft}% ragged left
+  \or
+    \renewcommand*{\@tufte@marginnote@justification}{\RaggedRight}% ragged right
+  \or
+    \renewcommand*{\@tufte@marginnote@justification}{\@tufte@justification@outer}% ragged outer (flush right on verso pages, flush left on recto pages)
+  \or
+    \renewcommand*{\@tufte@marginnote@justification}{\@tufte@justification@autodetect}% autodetects best justification mode based on all class options
+  \fi
+}{%
+  \TufteWarningNL{Invalid option `#1' for marginnote key.\MessageBreak Must be one of: justified, raggedleft,\MessageBreak raggedright, raggedouter, auto}
+  \renewcommand*{\@tufte@marginnote@justification}{\@tufte@justification@autodetect}% autodetects best justification mode based on all class options
+}
+
+\newcommand*{\@tufte@caption@justification}{\@tufte@justification@autodetect}
+\define@choicekey*+[tufte]{common}{caption}[\@tufte@kvtext\@tufte@kvnum]{justified,raggedleft,raggedright,raggedouter,auto}[auto]{%
+  \ifcase\@tufte@kvnum\relax
+    \renewcommand*{\@tufte@caption@justification}{\justifying}% justified
+  \or
+    \renewcommand*{\@tufte@caption@justification}{\RaggedLeft}% ragged left
+  \or
+    \renewcommand*{\@tufte@caption@justification}{\RaggedRight}% ragged right
+  \or
+    \renewcommand*{\@tufte@caption@justification}{\@tufte@justification@caption@outer}% ragged outer (flush right on verso pages, flush left on recto pages)
+  \or
+    \renewcommand*{\@tufte@caption@justification}{\@tufte@justification@autodetect}% autodetects best justification mode based on all class options
+  \fi
+}{%
+  \TufteWarningNL{Invalid option `#1' for caption key.\MessageBreak Must be one of: justified, raggedleft,\MessageBreak raggedright, raggedouter, auto}
+  \renewcommand*{\@tufte@caption@justification}{\@tufte@justification@autodetect}% autodetects best justification mode based on all class options
+}
+
+\newcommand*{\@tufte@citation@justification}{\@tufte@justification@autodetect}
+\define@choicekey*+[tufte]{common}{citation}[\@tufte@kvtext\@tufte@kvnum]{justified,raggedleft,raggedright,raggedouter,auto}[auto]{%
+  \ifcase\@tufte@kvnum\relax
+    \renewcommand*{\@tufte@citation@justification}{\justifying}% justified
+  \or
+    \renewcommand*{\@tufte@citation@justification}{\RaggedLeft}% ragged left
+  \or
+    \renewcommand*{\@tufte@citation@justification}{\RaggedRight}% ragged right
+  \or
+    \renewcommand*{\@tufte@citation@justification}{\@tufte@justification@outer}% ragged outer (flush right on verso pages, flush left on recto pages)
+  \or
+    \renewcommand*{\@tufte@citation@justification}{\@tufte@justification@autodetect}% autodetects best justification mode based on all class options
+  \fi
+}{%
+  \TufteWarningNL{Invalid option `#1' for citation key.\MessageBreak Must be one of: justified, raggedleft,\MessageBreak raggedright, raggedouter, auto}
+  \renewcommand*{\@tufte@citation@justification}{\@tufte@justification@autodetect}% autodetects best justification mode based on all class options
+}
+
+% The ``marginals'' key simultaneously sets the same justification for all marginal material
+\define@choicekey*+[tufte]{common}{marginals}[\@tufte@kvtext\@tufte@kvnum]{justified,raggedleft,raggedright,raggedouter,auto}[auto]{%
+  \ifcase\@tufte@kvnum\relax
+    \ExecuteOptionsX[tufte]<common>{citation=justified,sidenote=justified,caption=justified,marginnote=justified}% justified
+  \or
+    \ExecuteOptionsX[tufte]<common>{citation=raggedleft,sidenote=raggedleft,caption=raggedleft,marginnote=raggedleft}% ragged left
+  \or
+    \ExecuteOptionsX[tufte]<common>{citation=raggedright,sidenote=raggedright,caption=raggedright,marginnote=raggedright}% ragged right
+  \or
+    \ExecuteOptionsX[tufte]<common>{citation=raggedouter,sidenote=raggedouter,caption=raggedouter,marginnote=raggedouter}% ragged outer (flush right on verso pages, flush left on recto pages)
+  \or
+    \ExecuteOptionsX[tufte]<common>{citation=auto,sidenote=auto,caption=auto,marginnote=auto}% autodetects best justification mode based on all class options
+  \fi
+}{%
+  \TufteWarningNL{Invalid option `#1' for marginals key.\MessageBreak Must be one of: justified, raggedleft,\MessageBreak raggedright, raggedouter, auto}
+  \ExecuteOptionsX[tufte]<common>{citation=auto,sidenote=auto,caption=auto,marginnote=auto}% autodetects best justification mode based on all class options
+}
+
+
+%%
+% Unsupported options
 
-% FIXME: should probably specify options not supported like Mittelbach's aipproc.cls
+\newcommand{\@tufte@unsupported@option}[1]{\TufteWarningNL{Option `#1' is not supported -- \MessageBreak ignoring option}\OptionNotUsed}
 
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{\@tufte@class}}
-\ProcessOptions
+\DeclareOptionX[tufte]<common>{10pt}{\@tufte@unsupported@option{\CurrentOption}}
+\DeclareOptionX[tufte]<common>{11pt}{\@tufte@unsupported@option{\CurrentOption}}
+\DeclareOptionX[tufte]<common>{12pt}{\@tufte@unsupported@option{\CurrentOption}}
+\DeclareOptionX[tufte]<common>{a5paper}{\@tufte@unsupported@option{\CurrentOption}}
+\DeclareOptionX[tufte]<common>{executivepaper}{\@tufte@unsupported@option{\CurrentOption}}
+\DeclareOptionX[tufte]<common>{legalpaper}{\@tufte@unsupported@option{\CurrentOption}}
+\DeclareOptionX[tufte]<common>{landscape}{\@tufte@unsupported@option{\CurrentOption}}
+\DeclareOptionX[tufte]<common>{onecolumn}{\@tufte@unsupported@option{\CurrentOption}}
+\DeclareOptionX[tufte]<common>{twocolumn}{\@tufte@unsupported@option{\CurrentOption}}
+
+%%
+% Default `book' and `handout' options
+
+\ifthenelse{\equal{\@tufte@pkgname}{tufte-book}}
+  {\ExecuteOptionsX[tufte]<common>{titlepage}}
+  {\ExecuteOptionsX[tufte]<common>{notitlepage}}
+
+
+\DeclareOptionX*{%
+  \TufteInfoNL{Passing \CurrentOption\space to the `\@tufte@class' class.}%
+  \PassOptionsToClass{\CurrentOption}{\@tufte@class}%
+}
+\ProcessOptionsX*[tufte]<common>\relax
+
+%%
+% Load the appropriate base class
+\TufteInfoNL{Loading the base class `\@tufte@class'}
+\LoadClass{\@tufte@class}
 
 %%
 % Detect whether we're in two-side mode or not.  (Used to set up running
@@ -147,15 +285,57 @@
 }
 
 %%
-% Load the `hyperref' package.  We will set more options later.
-% TODO Set nice defaults for hyperref options
-\ifthenelse{\boolean{@tufte@xetex}}
-  {\RequirePackage[hyperfootnotes=false,xetex]{hyperref}}
-  {\RequirePackage[hyperfootnotes=false]{hyperref}}
+% Globally sets the length
 
-\hypersetup{%
-  pdfborder = {0 0 0},
-  bookmarksdepth = section,
+\newcommand*{\gsetlength}[2]{%
+  \setlength{#1}{#2}%
+  \global#1=#1\relax%
+}
+
+%%
+% Globally sets a boolean
+
+\newcommand*{\gsetboolean}[2]{% based on code from ifthen pkg
+  \lowercase{\def\@tempa{#2}}%
+  \@ifundefined{@tempswa\@tempa}%
+    {\PackageError{ifthen}{You can only set a boolean to `true' or `false'}\@ehc}%
+    {\@ifundefined{#1\@tempa}%
+      {\PackageError{ifthen}{Boolean #1 undefined}\@ehc}%
+      {\global\csname#1\@tempa\endcsname}%
+    }%
+}
+
+%%
+% The titlesec and titletoc packages are used to change the style of the
+% section headings.  These packages should be loaded before the hyperref
+% package.
+
+\RequirePackage{titlesec,titletoc}
+
+%%%
+%% Loads the hyperref package and sets some default options.
+
+\newcommand{\TufteLoadHyperref}{%
+  \ifthenelse{\boolean{@tufte@xetex}}
+    {\RequirePackage[unicode,hyperfootnotes=false,xetex]{hyperref}}
+    {\RequirePackage[unicode,hyperfootnotes=false]{hyperref}}
+  \hypersetup{%
+    pdfborder = {0 0 0},
+    bookmarksdepth = section,
+    citecolor = DarkGreen,
+    linkcolor = DarkBlue,
+    pagecolor = DarkBlue,
+    urlcolor = DarkGreen,
+  }%
+}
+
+%%%
+%% Load the `hyperref' package.
+
+\ifthenelse{\boolean{@tufte@loadhyper}}{%
+  \TufteLoadHyperref%
+}{% hyperfootnotes override our modifications to the \footnote* and \@footnote* commands.
+  \PassOptionsToPackage{hyperfootnotes=false}{hyperref}
 }
 
 %%
@@ -197,7 +377,7 @@
 \renewcommand\Large{\@setfontsize\Large\@xiipt{16}}
 \renewcommand\LARGE{\@setfontsize\LARGE\@xivpt{18}}
 \renewcommand\huge{\@setfontsize\huge\@xxpt{30}}
-\renewcommand\Huge{\@setfontsize\Huge\@xxivpt{36}}
+\renewcommand\Huge{\@setfontsize\Huge{24}{36}}
 
 \setlength\leftmargini   {1pc}
 \setlength\leftmarginii  {1pc}
@@ -241,6 +421,10 @@
   {\geometry{a4paper,left=24.8mm,top=27.4mm,headsep=2\baselineskip,textwidth=107mm,marginparsep=8.2mm,marginparwidth=49.4mm,textheight=49\baselineskip,headheight=\baselineskip}}
   {}
 
+\ifthenelse{\boolean{@tufte@bfivepaper}}
+  {\geometry{paperwidth=176mm,paperheight=250mm,left=14.66mm,top=13.88mm,textwidth=102.66mm,marginparsep=7.33mm,marginparwidth=36.66mm,textheight=38\baselineskip,includehead}}
+  {}
+
 \ifthenelse{\boolean{@tufte@symmetric}}
   {}
   {\geometry{asymmetric}}% forces internal LaTeX `twoside'
@@ -258,6 +442,15 @@
   {\newcommand{\@tufte@marginfont}{\normalfont\footnotesize\sffamily}}
   {\newcommand{\@tufte@marginfont}{\normalfont\footnotesize}}
 
+\newcommand*{\@tufte@sidenote@font}{\@tufte@marginfont}
+\newcommand*{\@tufte@caption@font}{\@tufte@marginfont}
+\newcommand*{\@tufte@marginnote@font}{\@tufte@marginfont}
+\newcommand*{\@tufte@citation@font}{\@tufte@marginfont}
+
+\newcommand*{\setsidenotefont}[1]{\renewcommand*{\@tufte@sidenote@font}{#1}}
+\newcommand*{\setcaptionfont}[1]{\renewcommand*{\@tufte@caption@font}{#1}}
+\newcommand*{\setmarginnotefont}[1]{\renewcommand*{\@tufte@marginnote@font}{#1}}
+\newcommand*{\setcitationfont}[1]{\renewcommand*{\@tufte@citation@font}{#1}}
 
 %%
 % Set the justification baesed on the `justified' class option
@@ -284,11 +477,11 @@
 
 \newboolean{@tufte@changepage}
 \IfFileExists{changepage.sty}{%
-  \PackageInfo{\@tufte@pkgname}{Found changepage.sty}
+  \TufteDebugInfoNL{Found changepage.sty}
   \RequirePackage[strict]{changepage}
   \setboolean{@tufte@changepage}{true}
 }{%
-  \PackageInfo{\@tufte@pkgname}{Found chngpage.sty}
+  \TufteDebugInfoNL{Found chngpage.sty}
   \RequirePackage[strict]{chngpage}
   \setboolean{@tufte@changepage}{false}
 }
@@ -309,26 +502,30 @@
       \setboolean{@tufte@odd@page}{true}%
     \else%
       \setboolean{@tufte@odd@page}{false}%
-    \fi
+    \fi%
   }%
 }
 
-
+%%
 % Compute lengths used for full-width displays
 
-\newlength{\@tufte@overhang}
-\setlength{\@tufte@overhang}{\marginparwidth}
-\addtolength{\@tufte@overhang}{\marginparsep}
-
+\newlength{\@tufte@overhang}% used by the fullwidth environment and the running heads
 \newlength{\@tufte@fullwidth}
-\setlength{\@tufte@fullwidth}{\textwidth}
-\addtolength{\@tufte@fullwidth}{\marginparsep}
-\addtolength{\@tufte@fullwidth}{\marginparwidth}
-
 \newlength{\@tufte@caption@fill}
-\setlength{\@tufte@caption@fill}{\textwidth}
-\addtolength{\@tufte@caption@fill}{\marginparsep}
 
+\newcommand{\TufteRecalculate}{%
+  \setlength{\@tufte@overhang}{\marginparwidth}
+  \addtolength{\@tufte@overhang}{\marginparsep}
+
+  \setlength{\@tufte@fullwidth}{\textwidth}
+  \addtolength{\@tufte@fullwidth}{\marginparsep}
+  \addtolength{\@tufte@fullwidth}{\marginparwidth}
+
+  \setlength{\@tufte@caption@fill}{\textwidth}
+  \addtolength{\@tufte@caption@fill}{\marginparsep}
+}
+
+\AtBeginDocument{\TufteRecalculate}
 
 %%
 % Modified \title, \author, and \date commands.  These store the
@@ -359,7 +556,7 @@
   \ifthenelse{\isempty{#1}}%
     {\renewcommand{\plaintitle}{\thanklesstitle}}% use thankless title
     {\renewcommand{\plaintitle}{#1}}% use provided plain-text title
-  \hypersetup{pdftitle={\plaintitle}}% set the PDF metadata title
+  \@ifpackageloaded{hyperref}{\hypersetup{pdftitle={\plaintitle}}}{}% set the PDF metadata title
 }
 
 \def\@author{}% default author is empty (suppresses LaTeX's ``no author'' warning)
@@ -373,7 +570,7 @@
   \ifthenelse{\isempty{#1}}
     {\renewcommand{\plainauthor}{\thanklessauthor}}% use thankless author
     {\renewcommand{\plainauthor}{#1}}% use provided plain-text author
-  \hypersetup{pdfauthor={\plainauthor}}% set the PDF metadata author
+  \@ifpackageloaded{hyperref}{\hypersetup{pdfauthor={\plainauthor}}}{}% set the PDF metadata author
 }
 
 \renewcommand*{\date}[1]{%
@@ -425,21 +622,13 @@
 % Failing that, try to use the `soul' package, if it's available.
 % Failing that, well, I give up.
 
+\DeclareTextFontCommand{\textsmallcaps}{\scshape}
+
 \RequirePackage{textcase} % provides \MakeTextUppercase and \MakeTextLowercase
-\def\allcapsspacing{\relax}
-\def\smallcapsspacing{\relax}
-\newcommand{\allcaps}[1]{\MakeTextUppercase{\allcapsspacing{#1}}}
-\newcommand{\smallcaps}[1]{\MakeTextLowercase{\textsc{#1}}}
-
-\newcommand{\@tufte@loadsoul}{%
-  \IfFileExists{soul.sty}{%
-    \RequirePackage{soul}
-    \sodef\allcapsspacing{\upshape}{0.15em}{0.65em}{0.6em}
-    \sodef\smallcapsspacing{\scshape}{0.075em}{0.5em}{0.6em}
-  }{
-    \PackageWarningNoLine{\@tufte@pkgname}{Couldn't locate `soul' package.}
-  }% soul not installed... giving up.
-}
+\def\allcapsspacing{\TufteWarning{Proper spacing of ALL-CAPS letters has not been set up.}}
+\def\smallcapsspacing{\TufteWarning{Proper spacing of small-caps letters has not been set up.}}
+\newcommand{\allcaps}[1]{\allcapsspacing{\MakeTextUppercase{#1}}}
+\newcommand{\smallcaps}[1]{\smallcapsspacing{\MakeTextLowercase{#1}}}
 
 % If we're using pdfLaTeX v1.40+, use the letterspace package. 
 % If we're using pdfLaTex < v1.40, use the soul package.
@@ -447,12 +636,12 @@
 % Otherwise fall back on the soul package.
 
 \ifthenelse{\boolean{@tufte@pdf}}
-  {\PackageInfo{\@tufte@pkgname}{ifpdf = true}}
-  {\PackageInfo{\@tufte@pkgname}{ifpdf = false}}
+  {\TufteDebugInfoNL{ifpdf = true}}
+  {\TufteDebugInfoNL{ifpdf = false}}
 
 \ifthenelse{\boolean{@tufte@xetex}}
-  {\PackageInfo{\@tufte@pkgname}{ifxetex = true}}
-  {\PackageInfo{\@tufte@pkgname}{ifxetex = false}}
+  {\TufteDebugInfoNL{ifxetex = true}}
+  {\TufteDebugInfoNL{ifxetex = false}}
 
 % Check pdfLaTeX version
 \def\@tufte@pdftexversion{0}
@@ -470,36 +659,78 @@
   \fi
 \fi
 
-\ifthenelse{\boolean{@tufte@letterspace}}
-  {%
-  \ifnum\@tufte@pdftexversion<6
-    % pdfLaTeX version is too old or not using pdfLaTeX
-    \ifthenelse{\boolean{@tufte@xetex}}
-      {% TODO use xetex letterspacing
-      \PackageInfo{\@tufte@pkgname}{XeTeX detected. Reverting to `soul' package for letterspacing.}
-      \@tufte@loadsoul}
-      {% use `soul' package for letterspacing
-      \PackageInfo{\@tufte@pkgname}{Old version of pdfTeX detected.  Reverting to `soul' package for letterspacing.}
-      \@tufte@loadsoul}
-  \else
-    \IfFileExists{letterspace.sty}{% 
-      \PackageInfo{\@tufte@pkgname}{Modern version of pdfTeX detected.  Using `letterspace' package.}
+\newboolean{@tufte@letterspace@pkg@prereqs}
+\setboolean{@tufte@letterspace@pkg@prereqs}{true}
+\ifnum\@tufte@pdftexversion<6
+  \setboolean{@tufte@letterspace@pkg@prereqs}{false}
+\fi
+
+
+\ifthenelse{\boolean{@tufte@letterspace}}{%
+  \ifthenelse{\boolean{@tufte@pdf}\AND\boolean{@tufte@letterspace@pkg@prereqs}\AND\NOT\boolean{@tufte@xetex}}{%
+    % load letterspace pkg
+    \IfFileExists{letterspace.sty}{%
+      \TufteDebugInfoNL{Modern version of pdfTeX detected. \MessageBreak Using `letterspace' package}
       \RequirePackage{letterspace}
       % Set up letterspacing (using microtype package) -- requires pdfTeX v1.40+
       \renewcommand{\allcapsspacing}[1]{\textls[200]{##1}}
       \renewcommand{\smallcapsspacing}[1]{\textls[50]{##1}}
       \renewcommand{\allcaps}[1]{\textls[200]{\MakeTextUppercase{##1}}}
-      \renewcommand{\smallcaps}[1]{\textsc{\MakeTextLowercase{##1}}}
-    }{% microtype failed, check for soul
-      \PackageInfo{\@tufte@pkgname}{Modern version of pdfTeX detected, but `letterspace' package not installed.  Reverting to  `soul' package for letterspacing.}
-      \@tufte@loadsoul
-    }
-  \fi}
-  {}
-
+      \renewcommand{\smallcaps}[1]{\smallcapsspacing{\scshape\MakeTextLowercase{##1}}}
+      \renewcommand{\textsc}[1]{\smallcapsspacing{\textsmallcaps{##1}}}
+    }{}%
+  }{}%
+  % load soul pkg
+  \@ifpackageloaded{letterspace}{}{%
+    \IfFileExists{soul.sty}{%
+      \RequirePackage{soul}
+      \sodef\allcapsspacing{}{0.15em}{0.65em}{0.6em}
+      \sodef\smallcapsspacing{}{0.075em}{0.5em}{0.6em}
+      \sodef\sotextsc{\scshape}{0.075em}{0.5em}{0.6em}
+      \renewcommand{\allcaps}[1]{\allcapsspacing{\MakeTextUppercase{##1}}}
+      \renewcommand{\smallcaps}[1]{\smallcapsspacing{\scshape\MakeTextLowercase{##1}}}
+      \renewcommand{\textsc}[1]{\sotextsc{##1}}
+    }{
+      \TufteWarningNL{Couldn't locate `soul' package}
+    }% soul not installed... giving up.
+  }%
+}{}
 
-\DeclareTextFontCommand{\textsmallcaps}{\scshape}
-\renewcommand{\textsc}[1]{\textsmallcaps{\smallcapsspacing{#1}}}
+%\ifthenelse{\boolean{@tufte@letterspace}}{%
+  %\ifthenelse{\boolean{pdf}}{%
+    %\ifthenelse{\NOT\boolean{@tufte@letterspace@pkg@prereqs}}{%
+      %% pdfLaTeX version is too old or not using pdfLaTeX
+      %\ifthenelse{\boolean{@tufte@xetex}}{%
+        %% TODO use xetex letterspacing
+        %\TufteDebugInfoNL{XeTeX detected. \MessageBreak Reverting to `soul' package for letterspacing}%
+        %\@tufte@loadsoul%
+      %}{%
+        %% use `soul' package for letterspacing
+        %\TufteDebugInfoNL{Old version of pdfTeX detected. \MessageBreak Reverting to `soul' package for letterspacing}%
+        %\@tufte@loadsoul%
+      %}
+    %}{%
+      %\IfFileExists{letterspace.sty}{%
+        %\TufteDebugInfoNL{Modern version of pdfTeX detected. \MessageBreak Using `letterspace' package}
+        %\RequirePackage{letterspace}
+        %% Set up letterspacing (using microtype package) -- requires pdfTeX v1.40+
+        %\renewcommand{\allcapsspacing}[1]{\textls[200]{##1}}
+        %\renewcommand{\smallcapsspacing}[1]{\textls[50]{##1}}
+        %\renewcommand{\allcaps}[1]{\textls[200]{\MakeTextUppercase{##1}}}
+        %\renewcommand{\smallcaps}[1]{\smallcapsspacing{\MakeTextLowercase{##1}}}
+        %\renewcommand{\textsc}[1]{\smallcapsspacing{\textsmallcaps{##1}}}
+      %}{% microtype failed, check for soul
+        %\TufteDebugInfoNL{Modern version of pdfTeX detected, but `letterspace' \MessageBreak package not installed.  \MessageBreak Reverting to  `soul' package for letterspacing}
+        %\@tufte@loadsoul
+      %}%
+    %}%
+  %}{%
+    %\TufteDebugInfoNL{Plain LaTeX detected. \MessageBreak Using `soul' package for letterspacing}
+    %\@tufte@loadsoul
+  %}
+%}{%
+%% we're not to load letterspacing, so do nothing
+%}
 
 
 %%
@@ -537,6 +768,11 @@
                 \item\relax}
                {\endlist}
 
+%%
+% Italicize description run-in headings (instead of the default bold)
+
+\renewcommand*\descriptionlabel[1]{\hspace\labelsep\normalfont\em #1}
+
 
 %%
 % Used for doublespacing, and other linespacing
@@ -585,7 +821,7 @@
 %%
 % Citations should go in the margin as sidenotes
 
-\RequirePackage[numbers]{natbib}
+\RequirePackage{natbib}
 \RequirePackage{bibentry}        % allows bibitems to be typeset outside thebibliography environment
 % Redefine the \BR@b@bibitem command to fix a bug with bibentry+chicago style
 \renewcommand\BR@b@bibitem[2][]{%
@@ -606,6 +842,7 @@
   \@for\@temp@bibkey:=#2\do{\let\@temp@last@bibkey\@temp@bibkey}%
   \sidenote[][#1]{%
     % Loop through all the bibentries, separating them with semicolons and spaces
+    \normalsize\normalfont\@tufte@citation@font%
     \setcounter{@tufte@num@bibkeys}{0}%
     \@for\@temp@bibkeyx:=#2\do{%
       \ifthenelse{\equal{\@temp@last@bibkey}{\@temp@bibkeyx}}%
@@ -637,8 +874,8 @@
   \@for\@temp@bibkey:=\@tufte@citations\do{\let\@temp@last@bibkey\@temp@bibkey}%
   \marginpar{%
     \hbox{}\vspace*{#1}%
-    \@tufte@marginfont%
-    \@tufte@justification%
+    \@tufte@citation@font%
+    \@tufte@citation@justification%
     \@tufte@margin@par% use parindent and parskip settings for marginal text
     \vspace*{-1\baselineskip}%
     % Loop through all the bibentries, separating them with semicolons and spaces
@@ -675,12 +912,12 @@
 
 \RequirePackage{optparams}% for our new sidenote commands -- provides multiple optional arguments for commands
 
-\providecommand*{\footnotelayout}{\@tufte@marginfont\@tufte@justification}
-\renewcommand{\footnotelayout}{\@tufte@marginfont\@tufte@justification}
+\providecommand*{\footnotelayout}{\@tufte@sidenote@font\@tufte@sidenote@justification}
+\renewcommand{\footnotelayout}{\@tufte@sidenote@font\@tufte@sidenote@justification}
 
 % Override footmisc's definition to set the sidenote marks (numbers) inside the
 % sidenote's text block.
-\long\def\@makefntext#1{\@textsuperscript{\@tufte@marginfont\tiny\@thefnmark}\,\footnotelayout#1}
+\long\def\@makefntext#1{\@textsuperscript{\@tufte@sidenote@font\tiny\@thefnmark}\,\footnotelayout#1}
 
 % Set the in-text footnote mark in the same typeface as the body text itself.
 \def\@makefnmark{\hbox{\@textsuperscript{\normalfont\footnotesize\@thefnmark}}}
@@ -732,13 +969,18 @@
 %
 % Define \sidenote command.  Can handle \cite.
 
-\newcommand{\@tufte@sidenote@vertical@offset}{0pt}
+\newlength{\@tufte@sidenote@vertical@offset}
+\setlength{\@tufte@sidenote@vertical@offset}{0pt}
 
 % #1 = footnote num, #2 = vertical offset, #3 = footnote text
 \long\def\@tufte@sidenote[#1][#2]#3{%
   \let\cite\@tufte@infootnote@cite%   use the in-sidenote \cite command
   \gdef\@tufte@citations{}%           clear out any old citations
-  \ifthenelse{\NOT\isempty{#2}}{\renewcommand{\@tufte@sidenote@vertical@offset}{#2}}{}%
+  \ifthenelse{\NOT\isempty{#2}}{%
+    \gsetlength{\@tufte@sidenote@vertical@offset}{#2}%
+  }{%
+    \gsetlength{\@tufte@sidenote@vertical@offset}{0pt}%
+  }%
   \ifthenelse{\isempty{#1}}{%
     % no specific footnote number provided
     \stepcounter\@mpfn%
@@ -769,7 +1011,7 @@
   \let\cite\@tufte@infootnote@cite%   use the in-sidenote \cite command
   \gdef\@tufte@citations{}%           clear out any old citations
   \@tufte@margin@par%                 use parindent and parskip settings for marginal text
-  \marginpar{\hbox{}\vspace*{#1}\@tufte@marginfont\@tufte@justification\vspace*{-1\baselineskip}\noindent #2}%
+  \marginpar{\hbox{}\vspace*{#1}\@tufte@marginnote@font\@tufte@marginnote@justification\vspace*{-1\baselineskip}\noindent #2}%
   \@tufte@reset@par%                  use parindent and parskip settings for body text
   \@tufte@print@citations%            print any citations
   \let\cite\@tufte@normal@cite%       go back to using normal in-text \cite command
@@ -790,10 +1032,10 @@
   {\FloatBarrier% process all floats before this point so the figure/table numbers stay in order.
   \begin{lrbox}{\@tufte@margin@floatbox}%
   \begin{minipage}{\marginparwidth}%
-    \@tufte@marginfont%
+    \@tufte@caption@font%
     \def\@captype{#2}%
     \hbox{}\vspace*{#1}%
-    \@tufte@justification%
+    \@tufte@caption@justification%
     \@tufte@margin@par%
     \noindent%
   }
@@ -814,16 +1056,58 @@
 
 %%
 % Margin table environment
+
 \newenvironment{margintable}[1][-1.2ex]%
   {\begin{@tufte@margin@float}[#1]{table}}
   {\end{@tufte@margin@float}}
 
 
 %%
-% A collection of macros to be used with the new Tufte-style float environments
+% Auto-detects the proper text alignment based on the various class options
+
+\newcommand*{\@tufte@justification@autodetect}{%
+  \ifthenelse{\boolean{@tufte@justified}}%
+    {\justifying}%
+    {\RaggedRight}%
+}
+
+%%
+% Forces the outer edge of the caption to be set ragged.  
+% Therefore, on verso pages it's ragged left, and on recto pages it's ragged right.
+
+\newcommand*{\@tufte@justification@caption@outer}{%
+  \ifthenelse{\boolean{@tufte@float@recto}}%
+    {\RaggedRight}%
+    {\RaggedLeft}%
+}
+
+\newcommand*{\@tufte@justification@outer}{%
+  \@tufte@checkoddpage%
+  \ifthenelse{\boolean{@tufte@odd@page}}%
+    {\RaggedRight}%
+    {\RaggedLeft}%
+}
+
+
+
+%%
+% A collection of macros to be used with the new Tufte-style float environments.
+% \setfloatalignment forces the caption placement to be treated as top, bottom, etc.
+% \forcerectofloat forces the float to be treated as if it were appearing on a recto page.
+% \forceversofloat does the same, but for verso pages.
+
+\newcommand{\@tufte@float@debug@info}{}% contains debug info generated as the float is processed
+\newcommand{\@tufte@float@debug}[1]{% adds debug info to the queue for output
+\ifthenelse{\equal{\@tufte@float@debug@info}{}}%
+    {\def\@tufte@float@debug@info{#1}}%
+    {\g@addto@macro\@tufte@float@debug@info{\MessageBreak#1}}
+}
 
 \newcommand{\floatalignment}{x}% holds the current float alignment (t, b, h, p)
-\newcommand{\setfloatalignment}[1]{\renewcommand{\floatalignment}{#1}}% manually sets the float alignment
+\newcommand{\setfloatalignment}[1]{\global\def\floatalignment{#1}\@tufte@float@debug{Forcing position: [#1]}}% manually sets the float alignment
+\newboolean{@tufte@float@recto}
+\newcommand{\forcerectofloat}{\gsetboolean{@tufte@float@recto}{true}\@tufte@float@debug{Forcing page: [recto]}}
+\newcommand{\forceversofloat}{\gsetboolean{@tufte@float@recto}{false}\@tufte@float@debug{Forcing page: [verso]}}
 
 % Boxes to temporarily store our float and caption
 \newsavebox{\@tufte@figure@box}
@@ -833,22 +1117,21 @@
 \let\@tufte@orig@float\@float
 \let\@tufte@orig@endfloat\end@float
 
-% Save original LaTeX \caption and \label commands
-\AtBeginDocument{%
-  \let\@tufte@orig@caption\caption%
-  \let\@tufte@orig@label\label%
-}
+% New length for tweaking float captions
+\newlength{\@tufte@caption@vertical@offset}
+\setlength{\@tufte@caption@vertical@offset}{0pt}
 
 % Store the caption and label contents
 \newcommand{\@tufte@stored@shortcaption}{}
 \newcommand{\@tufte@stored@caption}{}
 \newcommand{\@tufte@stored@label}{}
 
-\newcommand{\@tufte@caption}[2][]{%
-  \ifthenelse{\isempty{#1}}
-    {\gdef\@tufte@stored@shortcaption{#2}}%
+\long\def\@tufte@caption[#1][#2]#3{%
+  \ifthenelse{\isempty{#1}}%
+    {\gdef\@tufte@stored@shortcaption{#3}}%
     {\gdef\@tufte@stored@shortcaption{#1}}%
-  \gdef\@tufte@stored@caption{#2}%
+  \gsetlength{\@tufte@caption@vertical@offset}{-#2}% we want a positive offset to lower captions
+  \gdef\@tufte@stored@caption{#3}%
 }
 
 \newcommand{\@tufte@label}[1]{%
@@ -857,26 +1140,47 @@
 
 \newcommand{\@tufte@fps}{}
 
-% TODO make sure new caption and figure code can handle [p] and [h] placements well
-% TODO handle the symmetric class option (move caption to other side of verso pages)
+\newboolean{@tufte@float@star}
+\newlength{\@tufte@float@contents@width}
 
 %%
 % Define a float environment to place the captions in the margin space
 
-\newenvironment{@tufte@float}[2][htbp]
-  {% If the float placement specifier is 'b' and only 'b', then bottom-align the mini-pages, otherwise top-align them.
+\newenvironment{@tufte@float}[3][htbp]%
+  {% begin @tufte@float
+    % Should this float be full-width or just text-width?
+    \ifthenelse{\equal{#3}{star}}%
+      {\gsetboolean{@tufte@float@star}{true}}%
+      {\gsetboolean{@tufte@float@star}{false}}%
+    % Check page side (recto/verso) and store detected value -- can be overriden in environment contents
+    \@tufte@checkoddpage%
+    \ifthenelse{\boolean{@tufte@odd@page}}%
+      {\gsetboolean{@tufte@float@recto}{true}\@tufte@float@debug{Detected page: [recto/odd]}}%
+      {\gsetboolean{@tufte@float@recto}{false}\@tufte@float@debug{Detected page: [verso/even]}}%
+    % If the float placement specifier is 'b' and only 'b', then bottom-align the mini-pages, otherwise top-align them.
     \renewcommand{\@tufte@fps}{#1}%
+    \@tufte@float@debug{Allowed positions: [#1]}
     \ifthenelse{\equal{#1}{b}\OR\equal{#1}{B}}%
-      {\renewcommand{\floatalignment}{b}}%
-      {\renewcommand{\floatalignment}{t}}%
-    \renewcommand{\caption}[2][]{\@tufte@caption[##1]{##2}}%
+      {\renewcommand{\floatalignment}{b}\@tufte@float@debug{Presumed position: [bottom]}}%
+      {\renewcommand{\floatalignment}{t}\@tufte@float@debug{Presumed position: [top]}}%
+    % Capture the contents of the \caption and \label commands to use later
+    \global\let\@tufte@orig@caption\caption%
+    \global\let\@tufte@orig@label\label%
+    \renewcommand{\caption}{\optparams{\@tufte@caption}{[][0pt]}}%
     \renewcommand{\label}[1]{\@tufte@label{##1}}%
+    % Handle subfigure package compatibility
+    \ifthenelse{\boolean{@tufte@packages@subfigure}}{%
+      % don't move the label while inside a \subfigure or \subtable command
+      \global\let\label\@tufte@orig@label%
+    }{}% subfigure package is not loaded
     \@tufte@orig@float{#2}[#1]%
+    \ifthenelse{\boolean{@tufte@float@star}}%
+      {\setlength{\@tufte@float@contents@width}{\@tufte@fullwidth}}%
+      {\setlength{\@tufte@float@contents@width}{\textwidth}}%
     \begin{lrbox}{\@tufte@figure@box}%
-      \begin{minipage}[\floatalignment]{\textwidth}\hbox{}%
-  }
-  {% end @tufte@float
-        \par\hbox{}\vspace{-\baselineskip}\ifthenelse{\prevdepth>0}{\vspace{-\prevdepth}}{}% align baselines of boxes
+      \begin{minipage}[\floatalignment]{\@tufte@float@contents@width}\hbox{}%
+  }{% end @tufte@float
+      \par\hbox{}\vspace{-\baselineskip}\ifthenelse{\prevdepth>0}{\vspace{-\prevdepth}}{}% align baselines of boxes
       \end{minipage}%
     \end{lrbox}%
     % build the caption box
@@ -890,35 +1194,76 @@
     % now typeset the stored boxes
     \begin{fullwidth}%
       \begin{minipage}[\floatalignment]{\linewidth}%
-        \@tufte@checkoddpage%
-        \ifthenelse{\NOT\boolean{@tufte@symmetric}\OR\boolean{@tufte@odd@page}}{%
-          % asymmetric or page is odd, so caption is on the right
-          \usebox{\@tufte@figure@box}%
-          \hspace{\marginparsep}%
-          \smash{\usebox{\@tufte@caption@box}}%
-        }{%
-          % symmetric pages and page is even, so caption is on the left
-	  \strut\smash{\usebox{\@tufte@caption@box}}%
-          \hspace{\marginparsep}%
-	  \usebox{\@tufte@figure@box}%
-        }%
+        \ifthenelse{\boolean{@tufte@float@star}}%
+          {\@tufte@float@fullwidth[\@tufte@caption@vertical@offset]{\@tufte@figure@box}{\@tufte@caption@box}}%
+          {\@tufte@float@textwidth[\@tufte@caption@vertical@offset]{\@tufte@figure@box}{\@tufte@caption@box}}%
       \end{minipage}%
     \end{fullwidth}%
-    \@tufte@orig@endfloat%
+    \@tufte@orig@endfloat% end original LaTeX float environment
+    % output debug info
+    \ifthenelse{\boolean{@tufte@debug}}{%
+      \typeout{^^J^^J----------- Tufte-LaTeX float information ----------}%
+      \ifthenelse{\equal{\@tufte@stored@label}{}}%
+        {\typeout{Warning: Float unlabeled!}}%
+        {\typeout{Float label: [\@tufte@stored@label]}}%
+      \typeout{Page number: [\thepage]}%
+      \def\MessageBreak{^^J}%
+      \typeout{\@tufte@float@debug@info}%
+      \ifthenelse{\boolean{@tufte@symmetric}}%
+        {\typeout{Symmetric: [true]}}%
+        {\typeout{Symmetric: [false]}}%
+      \typeout{----------------------------------------------------^^J^^J}%
+    }{}%
     % reset commands and temp boxes and captions
+    \gdef\@tufte@float@debug@info{}%
     \let\caption\@tufte@orig@caption%
     \let\label\@tufte@orig@label%
     \begin{lrbox}{\@tufte@figure@box}\hbox{}\end{lrbox}%
     \begin{lrbox}{\@tufte@caption@box}\hbox{}\end{lrbox}%
     \gdef\@tufte@stored@shortcaption{}%
     \gdef\@tufte@stored@caption{}%
+    \gdef\@tufte@stored@label{}%
+    \gsetlength{\@tufte@caption@vertical@offset}{0pt}% reset caption offset
   }
 
+\newcommand{\@tufte@float@textwidth}[3][0pt]{%
+  \ifthenelse{\NOT\boolean{@tufte@symmetric}\OR\boolean{@tufte@float@recto}}{%
+    % asymmetric or page is odd, so caption is on the right
+    \hbox{%
+      \usebox{#2}%
+      \hspace{\marginparsep}%
+      \smash{\raisebox{#1}{\usebox{#3}}}%
+    }%
+    \@tufte@float@debug{Caption position: [right]}%
+  }{% symmetric pages and page is even, so caption is on the left
+    \hbox{%
+      \smash{\raisebox{#1}{\usebox{#3}}}%
+      \hspace{\marginparsep}%
+      \usebox{#2}%
+    }%
+    \@tufte@float@debug{Caption position: [left]}%
+  }%
+}
+
+\newcommand{\@tufte@float@fullwidth}[3][0pt]{%
+  \ifthenelse{\equal{\floatalignment}{b}}%
+    {% place caption above figure
+      \ifthenelse{\NOT\boolean{@tufte@symmetric}\OR\boolean{@tufte@float@recto}}%
+        {\hfill\smash{\raisebox{#1}{\usebox{#3}}}\par\usebox{#2}\@tufte@float@debug{Caption position: [above right]}}% caption on the right
+        {\smash{\raisebox{#1}{\usebox{#3}}}\hfill\par\usebox{#2}\@tufte@float@debug{Caption position: [above left]}}% caption on the left
+    }{% place caption below figure
+      \ifthenelse{\NOT\boolean{@tufte@symmetric}\OR\boolean{@tufte@float@recto}}%
+        {\usebox{#2}\par\hfill\smash{\raisebox{#1}{\usebox{#3}}}\@tufte@float@debug{Caption position: [below right]}}% caption on the right
+        {\usebox{#2}\par\smash{\raisebox{#1}{\usebox{#3}}}\hfill\@tufte@float@debug{Caption position: [below left]}}% caption on the left
+    }%
+}
+
+
 %%
 % Redefine the figure environment to place the captions in the margin space
 
 \renewenvironment{figure}[1][htbp]
-  {\begin{@tufte@float}[#1]{figure}}
+  {\begin{@tufte@float}[#1]{figure}{}}
   {\end{@tufte@float}}
 
 
@@ -926,106 +1271,37 @@
 % Redefine the table environment to place the captions in the margin space
 
 \renewenvironment{table}[1][htbp]
-  {\begin{@tufte@float}[#1]{table}}
+  {\begin{@tufte@float}[#1]{table}{}}
   {\end{@tufte@float}}
 
 
 %%
-% Full-width figures and tables
-
-\newenvironment{@tufte@float@star}[2][htbp]%
-  {% begin
-    % If the float placement specifier is 'b' and only 'b', then place the caption above the figure, else place the caption below the figure.
-    \renewcommand{\@tufte@fps}{#1}%
-    \ifthenelse{\equal{#1}{b}\OR\equal{#1}{B}}%
-      {\renewcommand{\floatalignment}{b}}%
-      {\renewcommand{\floatalignment}{t}}%
-    \renewcommand{\caption}[2][]{\@tufte@caption[##1]{##2}}%
-    \renewcommand{\label}[1]{\@tufte@label{##1}}%
-    \@tufte@orig@float{#2}[#1]%
-    \begin{lrbox}{\@tufte@figure@box}%
-      \begin{minipage}[\floatalignment]{\textwidth}\hbox{}%
-        \begin{fullwidth}
-  }%
-  {% end figure*
-          \par\hbox{}\vspace{-\baselineskip}\ifthenelse{\prevdepth>0}{\vspace{-\prevdepth}}{}% align baselines of boxes
-        \end{fullwidth}%
-      \end{minipage}%
-    \end{lrbox}%
-    % build the caption box
-    % TODO use \captionaboveskip and \captionbelowskip for spacing between caption and figure boxes
-    \begin{lrbox}{\@tufte@caption@box}%
-      \begin{minipage}[\floatalignment]{\marginparwidth}\hbox{}%
-        \ifthenelse{\NOT\equal{\@tufte@stored@caption}{}}{\@tufte@orig@caption[\@tufte@stored@shortcaption]{\@tufte@stored@caption}}{}%
-        \ifthenelse{\NOT\equal{\@tufte@stored@label}{}}{\@tufte@orig@label{\@tufte@stored@label}}{}%
-        \par\vspace{-\prevdepth}%% TODO: DOUBLE-CHECK FOR SAFETY
-      \end{minipage}%
-    \end{lrbox}%
-    % now typeset the stored boxes
-    \@tufte@checkoddpage%
-    \begin{fullwidth}%
-      \begin{minipage}[\floatalignment]{\linewidth}%
-        \ifthenelse{\equal{\floatalignment}{b}}
-          {% place caption above figure
-            \ifthenelse{\NOT\boolean{@tufte@symmetric}\OR\boolean{@tufte@odd@page}}
-              {% caption on the right
-                \hfill\smash{\usebox{\@tufte@caption@box}}%
-		\par\usebox{\@tufte@figure@box}%
-              }{% caption on the left
-                \smash{\usebox{\@tufte@caption@box}}\hfill\null%
-		\par\hspace{\@tufte@overhang}\usebox{\@tufte@figure@box}%
-              }%
-          }
-          {% place caption below figure
-            \ifthenelse{\NOT\boolean{@tufte@symmetric}\OR\boolean{@tufte@odd@page}}
-              {% caption on the right
-                \usebox{\@tufte@figure@box}\par%
-                \hspace{\@tufte@caption@fill}\smash{\usebox{\@tufte@caption@box}}%
-              }{% caption on the left
-                \null\hspace{\@tufte@overhang}\usebox{\@tufte@figure@box}\par%
-                \smash{\usebox{\@tufte@caption@box}}\hfill%
-              }%
-          }
-      \end{minipage}%
-    \end{fullwidth}%
-    \@tufte@orig@endfloat%
-    % reset commands and temp boxes and captions
-    \let\caption\@tufte@orig@caption%
-    \let\label\@tufte@orig@label%
-    \begin{lrbox}{\@tufte@figure@box}\hbox{}\end{lrbox}
-    \begin{lrbox}{\@tufte@caption@box}\hbox{}\end{lrbox}
-    \gdef\@tufte@stored@shortcaption{}
-    \gdef\@tufte@stored@caption{}
-  }
-
-
-%%
 % Full-width figure
 
 \renewenvironment{figure*}[1][htbp]%
-  {\begin{@tufte@float@star}[#1]{figure}}
-  {\end{@tufte@float@star}}
+  {\begin{@tufte@float}[#1]{figure}{star}}
+  {\end{@tufte@float}}
 
 
 %%
 % Full-width table
 
 \renewenvironment{table*}[1][htbp]%
-  {\begin{@tufte@float@star}[#1]{table}}
-  {\end{@tufte@float@star}}
+  {\begin{@tufte@float}[#1]{table}{star}}
+  {\end{@tufte@float}}
 
 
 %%
 % Full-page-width area
 
 \newenvironment{fullwidth}
-  {\ifthenelse{\boolean{@tufte@symmetric}}
-     {\ifthenelse{\boolean{@tufte@changepage}}{\begin{adjustwidth*}{}{-\@tufte@overhang}}{\begin{adjustwidth}[]{}{-\@tufte@overhang}}}
+  {\ifthenelse{\boolean{@tufte@symmetric}}%
+     {\ifthenelse{\boolean{@tufte@changepage}}{\begin{adjustwidth*}{}{-\@tufte@overhang}}{\begin{adjustwidth}[]{}{-\@tufte@overhang}}}%
      {\begin{adjustwidth}{}{-\@tufte@overhang}}%
-  }
-  {\ifthenelse{\boolean{@tufte@symmetric}}
-    {\ifthenelse{\boolean{@tufte@changepage}}{\end{adjustwidth*}}{\end{adjustwidth}}}
-    {\end{adjustwidth}}
+  }%
+  {\ifthenelse{\boolean{@tufte@symmetric}}%
+    {\ifthenelse{\boolean{@tufte@changepage}}{\end{adjustwidth*}}{\end{adjustwidth}}}%
+    {\end{adjustwidth}}%
   }
 
 %%
@@ -1035,13 +1311,13 @@
   \par%
   \addcontentsline{\csname ext@#1\endcsname}{#1}%
     {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}%
-  \begingroup
-    \@parboxrestore
-    \if@minipage
-      \@setminipage
-    \fi
-    \@tufte@marginfont\@tufte@justification%
-    \noindent\csname fnum@#1\endcsname: \ignorespaces#3\par
+  \begingroup%
+    \@parboxrestore%
+    \if@minipage%
+      \@setminipage%
+    \fi%
+    \@tufte@caption@font\@tufte@caption@justification%
+    \noindent\csname fnum@#1\endcsname: \ignorespaces#3\par%
     %\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
   \endgroup}
 
@@ -1090,9 +1366,11 @@
 
 % Set the header/footer width to be the body text block plus the margin
 % note area.
-\ifthenelse{\boolean{@tufte@symmetric}}
-  {\fancyhfoffset[LE,RO]{\@tufte@overhang}}
-  {\fancyhfoffset[RE,RO]{\@tufte@overhang}}
+\AtBeginDocument{%
+  \ifthenelse{\boolean{@tufte@symmetric}}
+    {\fancyhfoffset[LE,RO]{\@tufte@overhang}}
+    {\fancyhfoffset[RE,RO]{\@tufte@overhang}}
+}
 
 % The running heads/feet don't have rules
 \renewcommand{\headrulewidth}{0pt}
@@ -1150,6 +1428,7 @@
   \typeout{}
   \typeout{Class options:}
   \typeoutbool{a4paper}{@tufte@afourpaper}
+  \typeoutbool{b5paper}{@tufte@bfivepaper}
   \typeoutbool{load fonts}{@tufte@loadfonts}
   \typeoutbool{fully-justified}{@tufte@justified}
   \typeoutbool{letterspacing}{@tufte@letterspace}
@@ -1244,14 +1523,12 @@
 %%
 % Make Tuftian-style section headings and TOC formatting
 
-\RequirePackage{titlesec,titletoc}
-
 \titleformat{\chapter}%
   [display]% shape
   {\relax\ifthenelse{\NOT\boolean{@tufte@symmetric}}{\begin{fullwidth}}{}}% format applied to label+text
   {\itshape\huge\thechapter}% label
   {0pt}% horizontal separation between label and title body
-  {\huge\rm\itshape}% before the title body
+  {\huge\rmfamily\itshape}% before the title body
   [\ifthenelse{\NOT\boolean{@tufte@symmetric}}{\end{fullwidth}}{}]% after the title body
 
 \titleformat{\section}%
@@ -1278,7 +1555,6 @@
   {}% before the title body
   []% after the title body
 
-
 \titlespacing*{\chapter}{0pt}{50pt}{40pt}
 \titlespacing*{\section}{0pt}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
 \titlespacing*{\subsection}{0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus.2ex}
@@ -1286,7 +1562,7 @@
 % Subsubsection and following section headings shouldn't be used.
 % See Bringhurst's _The Elements of Typography_, section 4.2.2.
 \renewcommand\subsubsection{%
-  \PackageError{\@tufte@pkgname}{\noexpand\subsubsection is undefined by this class.%
+  \TufteError{\noexpand\subsubsection is undefined by this class.%
     \MessageBreak See Robert Bringhurst's _The Elements of 
     \MessageBreak Typographic Style_, section 4.2.2.
     \MessageBreak \noexpand\subsubsection was used}
@@ -1295,18 +1571,8 @@
     \MessageBreak related threads on Ask E.T. at http://www.edwardtufte.com/.}
 }
 
-%\renewcommand\paragraph{%
-%  \PackageError{\@tufte@pkgname}{\noexpand\paragraph is undefined by this class.%
-%    \MessageBreak See Robert Bringhurst's _The Elements of 
-%    \MessageBreak Typographic Style_, section 4.2.2.
-%    \MessageBreak \noexpand\paragraph was used}
-%    {From Bringhurst's _The Elements of Typographic Style_, section 4.2.2: Use as 
-%    \MessageBreak many levels of headings as you need, no more and no fewer.  Also see the many 
-%    \MessageBreak related threads on Ask E.T. at http://www.edwardtufte.com/.}
-%}
-
 \renewcommand\subparagraph{%
-  \PackageError{\@tufte@pkgname}{\noexpand\subparagraph is undefined by this class.%
+  \TufteError{\noexpand\subparagraph is undefined by this class.%
     \MessageBreak See Robert Bringhurst's _The Elements of 
     \MessageBreak Typographic Style_, section 4.2.2.
     \MessageBreak \noexpand\subparagraph was used}
@@ -1318,25 +1584,84 @@
 
 % Formatting for main TOC (printed in front matter)
 % {section} [left] {above} {before w/label} {before w/o label} {filler + page} [after]
-\ifthenelse{\boolean{@tufte@toc}}
-  {\titlecontents{chapter}%
+\ifthenelse{\boolean{@tufte@toc}}{%
+  \titlecontents{part}% FIXME
     [0em] % distance from left margin
-    {\begin{fullwidth}\fontsize{13pt}{18pt}\selectfont} % above (global formatting of entry)
-    {\contentslabel{2em}\rm\itshape} % before w/label (label = ``Chapter 1'')
-    {\rm\itshape} % before w/o label
-    {\rm\qquad\thecontentspage} % filler + page (leaders and page num)
-    [\vspace{1.5\baselineskip}\end{fullwidth}] % after
-  }
-  {}
+    {\vspace{1.5\baselineskip}\begin{fullwidth}\LARGE\rmfamily\itshape} % above (global formatting of entry)
+    {\contentslabel{2em}} % before w/label (label = ``II'')
+    {} % before w/o label
+    {\rmfamily\upshape\qquad\thecontentspage} % filler + page (leaders and page num)
+    [\end{fullwidth}] % after
+  \titlecontents{chapter}%
+    [0em] % distance from left margin
+    {\vspace{1.5\baselineskip}\begin{fullwidth}\LARGE\rmfamily\itshape} % above (global formatting of entry)
+    {\hspace*{0em}\contentslabel{2em}} % before w/label (label = ``2'')
+    {\hspace*{0em}} % before w/o label
+    {\rmfamily\upshape\qquad\thecontentspage} % filler + page (leaders and page num)
+    [\end{fullwidth}] % after
+  \titlecontents{section}% FIXME
+    [0em] % distance from left margin
+    {\vspace{0\baselineskip}\begin{fullwidth}\Large\rmfamily\itshape} % above (global formatting of entry)
+    {\hspace*{2em}\contentslabel{2em}} % before w/label (label = ``2.6'')
+    {\hspace*{2em}} % before w/o label
+    {\rmfamily\upshape\qquad\thecontentspage} % filler + page (leaders and page num)
+    [\end{fullwidth}] % after
+  \titlecontents{subsection}% FIXME
+    [0em] % distance from left margin
+    {\vspace{0\baselineskip}\begin{fullwidth}\large\rmfamily\itshape} % above (global formatting of entry)
+    {\hspace*{4em}\contentslabel{4em}} % before w/label (label = ``2.6.1'')
+    {\hspace*{4em}} % before w/o label
+    {\rmfamily\upshape\qquad\thecontentspage} % filler + page (leaders and page num)
+    [\end{fullwidth}] % after
+  \titlecontents{paragraph}% FIXME
+    [0em] % distance from left margin
+    {\vspace{0\baselineskip}\begin{fullwidth}\normalsize\rmfamily\itshape} % above (global formatting of entry)
+    {\hspace*{6em}\contentslabel{2em}} % before w/label (label = ``2.6.0.0.1'')
+    {\hspace*{6em}} % before w/o label
+    {\rmfamily\upshape\qquad\thecontentspage} % filler + page (leaders and page num)
+    [\end{fullwidth}] % after
+}{}
+
+%%
+% Format lists of figures/tables
 
-%\titlecontents{chapter}%
-%        [0em]% distance from left margin
-%        {\fontsize{12pt}{18pt}\selectfont}% above (global formatting of entry)
-%        {\textit}% before w/ label (label = ``Chapter 1'')
-%        {\textit}% before w/o label
-%        {\qquad\thecontentspage}% filler and page (leaders and page num)
-%        [\vspace{1.5\baselineskip}]% after
+\renewcommand\listoffigures{%
+  \ifthenelse{\equal{\@tufte@class}{book}}%
+    {\chapter*{\listfigurename}}%
+    {\section*{\listfigurename}}%
+%  \begin{fullwidth}%
+    \@starttoc{lof}%
+%  \end{fullwidth}%
+}
+
+\renewcommand\listoftables{%
+  \ifthenelse{\equal{\@tufte@class}{book}}%
+    {\chapter*{\listtablename}}%
+    {\section*{\listtablename}}%
+%  \begin{fullwidth}%
+    \@starttoc{lot}%
+%  \end{fullwidth}%
+}
+
+\newcommand{\@tufte@lof@line}[2]{%
+  % #1 is the figure/table number and its caption text
+  % #2 is the page number on which the figure/table appears
+  \leftskip 0.0em
+  \rightskip 0em
+  \parfillskip 0em plus 1fil
+  \parindent 0.0em
+  \@afterindenttrue
+  \interlinepenalty\@M
+  \leavevmode
+  \@tempdima 2.0em
+  \advance\leftskip\@tempdima
+  \null\nobreak\hskip -\leftskip
+  {#1}\nobreak\qquad\nobreak#2%
+  \par%
+}
 
+\renewcommand*\l@figure{\@tufte@lof@line}
+\let\l@table\l@figure
 
 
 %%
@@ -1405,6 +1730,125 @@
 
 
 %%
+% A couple commands to incresae the number of floats you can use at a time.
+
+\def\morefloats{% provides a total of 52 floats
+  \ifthenelse{\isundefined{\bx@S}}{%
+    \TufteDebugInfoNL{Adding 34 more float slots.}
+    \newinsert\bx@S
+    \newinsert\bx@T
+    \newinsert\bx@U
+    \newinsert\bx@V
+    \newinsert\bx@W
+    \newinsert\bx@X
+    \newinsert\bx@Y
+    \newinsert\bx@Z
+    \newinsert\bx@a
+    \newinsert\bx@b
+    \newinsert\bx@c
+    \newinsert\bx@d
+    \newinsert\bx@e
+    \newinsert\bx@f
+    \newinsert\bx@g
+    \newinsert\bx@h
+    \newinsert\bx@i
+    \newinsert\bx@j
+    \newinsert\bx@k
+    \newinsert\bx@l
+    \newinsert\bx@m
+    \newinsert\bx@n
+    \newinsert\bx@o
+    \newinsert\bx@p
+    \newinsert\bx@q
+    \newinsert\bx@r
+    \newinsert\bx@s
+    \newinsert\bx@t
+    \newinsert\bx@u
+    \newinsert\bx@v
+    \newinsert\bx@w
+    \newinsert\bx@x
+    \newinsert\bx@y
+    \newinsert\bx@z
+    \gdef\@freelist{\@elt\bx@A\@elt\bx@B\@elt\bx@C\@elt\bx@D\@elt\bx@E
+                    \@elt\bx@F\@elt\bx@G\@elt\bx@H\@elt\bx@I\@elt\bx@J
+                    \@elt\bx@K\@elt\bx@L\@elt\bx@M\@elt\bx@N
+                    \@elt\bx@O\@elt\bx@P\@elt\bx@Q\@elt\bx@R
+                    \@elt\bx@S\@elt\bx@T\@elt\bx@U\@elt\bx@V
+                    \@elt\bx@W\@elt\bx@X\@elt\bx@Y\@elt\bx@Z
+                    \@elt\bx@a\@elt\bx@b\@elt\bx@c\@elt\bx@d\@elt\bx@e
+                    \@elt\bx@f\@elt\bx@g\@elt\bx@h\@elt\bx@i\@elt\bx@j
+                    \@elt\bx@k\@elt\bx@l\@elt\bx@m\@elt\bx@n
+                    \@elt\bx@o\@elt\bx@p\@elt\bx@q\@elt\bx@r
+                    \@elt\bx@s\@elt\bx@t\@elt\bx@u\@elt\bx@v
+                    \@elt\bx@w\@elt\bx@x\@elt\bx@y\@elt\bx@z}%
+  }{% we've already added another 34 floats, so we'll add 26 more, but that's it!
+    \ifthenelse{\isundefined{\bx@AA}}{%
+      \TufteDebugInfoNL{Adding 26 more float slots.}
+      \newinsert\bx@AA
+      \newinsert\bx@BB
+      \newinsert\bx@CC
+      \newinsert\bx@DD
+      \newinsert\bx@EE
+      \newinsert\bx@FF
+      \newinsert\bx@GG
+      \newinsert\bx@HH
+      \newinsert\bx@II
+      \newinsert\bx@JJ
+      \newinsert\bx@KK
+      \newinsert\bx@LL
+      \newinsert\bx@MM
+      \newinsert\bx@NN
+      \newinsert\bx@OO
+      \newinsert\bx@PP
+      \newinsert\bx@QQ
+      \newinsert\bx@RR
+      \newinsert\bx@SS
+      \newinsert\bx@TT
+      \newinsert\bx@UU
+      \newinsert\bx@VV
+      \newinsert\bx@WW
+      \newinsert\bx@XX
+      \newinsert\bx@YY
+      \newinsert\bx@ZZ
+      \gdef\@freelist{\@elt\bx@A\@elt\bx@B\@elt\bx@C\@elt\bx@D\@elt\bx@E
+                      \@elt\bx@F\@elt\bx@G\@elt\bx@H\@elt\bx@I\@elt\bx@J
+                      \@elt\bx@K\@elt\bx@L\@elt\bx@M\@elt\bx@N
+                      \@elt\bx@O\@elt\bx@P\@elt\bx@Q\@elt\bx@R
+                      \@elt\bx@S\@elt\bx@T\@elt\bx@U\@elt\bx@V
+                      \@elt\bx@W\@elt\bx@X\@elt\bx@Y\@elt\bx@Z
+                      \@elt\bx@a\@elt\bx@b\@elt\bx@c\@elt\bx@d\@elt\bx@e
+                      \@elt\bx@f\@elt\bx@g\@elt\bx@h\@elt\bx@i\@elt\bx@j
+                      \@elt\bx@k\@elt\bx@l\@elt\bx@m\@elt\bx@n
+                      \@elt\bx@o\@elt\bx@p\@elt\bx@q\@elt\bx@r
+                      \@elt\bx@s\@elt\bx@t\@elt\bx@u\@elt\bx@v
+                      \@elt\bx@w\@elt\bx@x\@elt\bx@y\@elt\bx@z
+                      \@elt\bx@AA\@elt\bx@BB\@elt\bx@CC\@elt\bx@DD\@elt\bx@EE
+                      \@elt\bx@FF\@elt\bx@GG\@elt\bx@HH\@elt\bx@II\@elt\bx@JJ
+                      \@elt\bx@KK\@elt\bx@LL\@elt\bx@MM\@elt\bx@NN
+                      \@elt\bx@OO\@elt\bx@PP\@elt\bx@QQ\@elt\bx@RR
+                      \@elt\bx@SS\@elt\bx@TT\@elt\bx@UU\@elt\bx@VV
+                      \@elt\bx@WW\@elt\bx@XX\@elt\bx@YY\@elt\bx@ZZ}%
+    }{%
+      \TufteError{You may only call \string\morefloats\space twice. See the\MessageBreak Tufte-LaTeX documentation for other workarounds}
+        {There are already 78 float slots allocated. Try using \string\FloatBarrier\space or\MessageBreak \string\clearpage\space to place some floats before creating more.}
+    }%
+  }%
+}
+
+
+%%
+% Detect if the subfigure package has been loaded
+
+\newboolean{@tufte@packages@subfigure}
+\setboolean{@tufte@packages@subfigure}{false}
+\AtBeginDocument{%
+  \@ifpackageloaded{subfigure}
+    {\gsetboolean{@tufte@packages@subfigure}{true}}
+    {\gsetboolean{@tufte@packages@subfigure}{false}}%
+}
+
+
+%%
 % If debugging is enabled, print the Tufte-LaTeX options and the list of
 % files.
 
@@ -1417,7 +1861,8 @@
 % If there is a `tufte-common-local.tex' file, load it up.
 
 \IfFileExists{tufte-common-local.tex}
-  {\input{tufte-common-local}}
+  {\input{tufte-common-local.tex}%
+   \TufteInfoNL{Loading tufte-common-local.tex}}
   {}
 
 
diff --git a/Master/texmf-dist/tex/latex/tufte-latex/tufte-common.sty b/Master/texmf-dist/tex/latex/tufte-latex/tufte-common.sty
deleted file mode 100644
index 5fb331085f0..00000000000
--- a/Master/texmf-dist/tex/latex/tufte-latex/tufte-common.sty
+++ /dev/null
@@ -1,1427 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-
-\ProvidesPackage{tufte-common}[2009/05/17 v3.0.0 Common code for the Tufte-LaTeX styles]
-
-%%
-% We use the `xifthen' package to handle our package option switches
-\RequirePackage{xifthen}
-
-
-%%
-% `debug' option -- provides more information in the .log file for use in
-% troubleshooting problems
-\newboolean{@tufte@debug}
-\DeclareOption{debug}{\setboolean{@tufte@debug}{true}}
-
-%%
-% `nofonts' option -- doesn't load any fonts
-% `fonts' option -- tries to load fonts
-\newboolean{@tufte@loadfonts}\setboolean{@tufte@loadfonts}{true}
-\DeclareOption{fonts}{\setboolean{@tufte@loadfonts}{true}}
-\DeclareOption{nofonts}{\setboolean{@tufte@loadfonts}{false}}
-
-%%
-% `nols' option -- doesn't configure letterspacing
-% `ls' option -- configures letterspacing
-\newboolean{@tufte@letterspace}\setboolean{@tufte@letterspace}{true}
-\DeclareOption{ls}{\setboolean{@tufte@letterspace}{true}}
-\DeclareOption{nols}{\setboolean{@tufte@letterspace}{false}}
-
-%%
-% `book' and `handout' options
-\newcommand{\@tufte@class}{article}% the base LaTeX class (defaults to the article/handout style)
-\newcommand{\@tufte@pkgname}{tufte-handout}% the name of the package (defaults to tufte-handout)
-\DeclareOption{book}{%
-  \renewcommand{\@tufte@class}{book}
-  \renewcommand{\@tufte@pkgname}{tufte-book}
-  \setboolean{@tufte@titlepage}{true}
-}
-\DeclareOption{handout}{%
-  \renewcommand{\@tufte@class}{article}
-  \renewcommand{\@tufte@pkgname}{tufte-handout}
-  \setboolean{@tufte@titlepage}{false}
-}
-\DeclareOption{article}{% `article' is just an alias for `handout'
-  \renewcommand{\@tufte@class}{article}
-  \renewcommand{\@tufte@pkgname}{tufte-handout}
-  \setboolean{@tufte@titlepage}{false}
-}
-
-%%
-% `titlepage' option -- creates a full title page with \maketitle
-
-\newboolean{@tufte@titlepage}
-\DeclareOption{titlepage}{\setboolean{@tufte@titlepage}{true}}
-\DeclareOption{notitlepage}{\setboolean{@tufte@titlepage}{false}}
-
-%%
-% `a4paper' option
-
-\newboolean{@tufte@afourpaper}
-\DeclareOption{a4paper}{\setboolean{@tufte@afourpaper}{true}}
-
-%%
-% `sfsidenotes' option -- typesets sidenotes in sans serif typeface
-
-\newboolean{@tufte@sfsidenotes}
-\DeclareOption{sfsidenotes}{\setboolean{@tufte@sfsidenotes}{true}}
-
-%%
-% `symmetric' option -- puts marginpar space to the outside edge of the page
-%   Note: this option forces the twoside option (see the .cls files)
-
-\newboolean{@tufte@symmetric}
-\DeclareOption{symmetric}{
-  \setboolean{@tufte@symmetric}{true}
-  \PackageInfo{\@tufte@pkgname}{The `symmetric' option implies `twoside'}
-  %\ExecuteOptions{twoside}
-}
-
-%%
-% `twoside' option -- alternates running heads
-
-\newboolean{@tufte@twoside}
-\DeclareOption{twoside}{\setboolean{@tufte@twoside}{true}}
-
-%%
-% `notoc' option -- suppresses the Tufte-style table of contents
-
-\newboolean{@tufte@toc}
-\setboolean{@tufte@toc}{true}
-\DeclareOption{notoc}{\setboolean{@tufte@toc}{false}}
-\DeclareOption{toc}{\setboolean{@tufte@toc}{true}}
-
-%%
-% `justified' option -- uses fully justified text (flush left and flush
-% right) instead of ragged right.
-
-\newboolean{@tufte@justified}
-\DeclareOption{justified}{\setboolean{@tufte@justified}{true}}
-
-%%
-% `bidi' option -- loads the bidi package for bi-directional text
-
-\newboolean{@tufte@loadbidi}
-\DeclareOption{bidi}{\setboolean{@tufte@loadbidi}{true}}
-\DeclareOption{nobidi}{\setboolean{@tufte@loadbibi}{false}}
-
-% FIXME: should probably specify options not supported like Mittelbach's aipproc.cls
-
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{\@tufte@class}}
-\ProcessOptions
-
-%%
-% Detect whether we're in two-side mode or not.  (Used to set up running
-% heads later.)
-
-\ifthenelse{\boolean{@twoside}}
-  {\setboolean{@tufte@twoside}{true}}
-  {}
-
-
-
-%%
-% Detect if we're using pdfLaTeX
-
-\newboolean{@tufte@pdf}
-\IfFileExists{ifpdf.sty}{%
-  \RequirePackage{ifpdf}
-  \ifthenelse{\boolean{pdf}}
-    {\setboolean{@tufte@pdf}{true}}
-    {\setboolean{@tufte@pdf}{false}}
-}{% assume we're not using pdfTex?
-  \setboolean{@tufte@pdf}{false}
-}
-
-%%
-% Detect if we're using XeLaTeX
-
-\newboolean{@tufte@xetex}
-\IfFileExists{ifxetex.sty}{%
-  \RequirePackage{ifxetex}
-  \ifthenelse{\boolean{xetex}}
-    {\setboolean{@tufte@xetex}{true}}
-    {\setboolean{@tufte@xetex}{false}}
-}{% not using xelatex
-  \setboolean{@tufte@xetex}{false}
-}
-
-%%
-% Load the `hyperref' package.  We will set more options later.
-% TODO Set nice defaults for hyperref options
-\ifthenelse{\boolean{@tufte@xetex}}
-  {\RequirePackage[hyperfootnotes=false,xetex]{hyperref}}
-  {\RequirePackage[hyperfootnotes=false]{hyperref}}
-
-\hypersetup{%
-  pdfborder = {0 0 0},
-  bookmarksdepth = section,
-}
-
-%%
-% Set the font sizes and baselines to match Tufte's books
-\renewcommand\normalsize{%
-   \@setfontsize\normalsize\@xpt{14}%
-   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
-   \abovedisplayshortskip \z@ \@plus3\p@
-   \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@
-   \belowdisplayskip \abovedisplayskip
-   \let\@listi\@listI}
-\normalbaselineskip=14pt
-\normalsize
-\renewcommand\small{%
-   \@setfontsize\small\@ixpt{12}%
-   \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
-   \abovedisplayshortskip \z@ \@plus2\p@
-   \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@
-   \def\@listi{\leftmargin\leftmargini
-               \topsep 4\p@ \@plus2\p@ \@minus2\p@
-               \parsep 2\p@ \@plus\p@ \@minus\p@
-               \itemsep \parsep}%
-   \belowdisplayskip \abovedisplayskip
-}
-\renewcommand\footnotesize{%
-   \@setfontsize\footnotesize\@viiipt{10}%
-   \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
-   \abovedisplayshortskip \z@ \@plus\p@
-   \belowdisplayshortskip 3\p@ \@plus\p@ \@minus2\p@
-   \def\@listi{\leftmargin\leftmargini
-               \topsep 3\p@ \@plus\p@ \@minus\p@
-               \parsep 2\p@ \@plus\p@ \@minus\p@
-               \itemsep \parsep}%
-   \belowdisplayskip \abovedisplayskip
-}
-\renewcommand\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
-\renewcommand\tiny{\@setfontsize\tiny\@vpt\@vipt}
-\renewcommand\large{\@setfontsize\large\@xipt{15}}
-\renewcommand\Large{\@setfontsize\Large\@xiipt{16}}
-\renewcommand\LARGE{\@setfontsize\LARGE\@xivpt{18}}
-\renewcommand\huge{\@setfontsize\huge\@xxpt{30}}
-\renewcommand\Huge{\@setfontsize\Huge\@xxivpt{36}}
-
-\setlength\leftmargini   {1pc}
-\setlength\leftmarginii  {1pc}
-\setlength\leftmarginiii {1pc}
-\setlength\leftmarginiv  {1pc}
-\setlength\leftmarginv   {1pc}
-\setlength\leftmarginvi  {1pc}
-\setlength\labelsep      {.5pc}
-\setlength\labelwidth    {\leftmargini}
-\addtolength\labelwidth{-\labelsep}
-
-%%
-% \RaggedRight allows hyphenation
-
-\RequirePackage{ragged2e}
-\setlength{\RaggedRightRightskip}{\z@ plus 0.08\hsize}
-\setlength{\RaggedRightParindent}{1pc}
-
-% Paragraph indentation and separation for normal text
-\newcommand{\@tufte@reset@par}{%
-  \setlength{\RaggedRightParindent}{1.0pc}%
-  \setlength{\parindent}{1pc}%
-  \setlength{\parskip}{0pt}%
-}
-\@tufte@reset@par
-
-% Paragraph indentation and separation for marginal text
-\newcommand{\@tufte@margin@par}{%
-  \setlength{\RaggedRightParindent}{0.5pc}%
-  \setlength{\parindent}{0.5pc}%
-  \setlength{\parskip}{0pt}%
-}
-
-
-%%
-% Set page layout geometry
-
-\RequirePackage[letterpaper,left=1in,top=1in,headsep=2\baselineskip,textwidth=26pc,marginparsep=2pc,marginparwidth=12pc,textheight=44\baselineskip,headheight=\baselineskip]{geometry}
-
-\ifthenelse{\boolean{@tufte@afourpaper}}
-  {\geometry{a4paper,left=24.8mm,top=27.4mm,headsep=2\baselineskip,textwidth=107mm,marginparsep=8.2mm,marginparwidth=49.4mm,textheight=49\baselineskip,headheight=\baselineskip}}
-  {}
-
-\ifthenelse{\boolean{@tufte@symmetric}}
-  {}
-  {\geometry{asymmetric}}% forces internal LaTeX `twoside'
-
-
-%%
-% Separation marginpars by a line's worth of space.
-
-\setlength\marginparpush{10pt}
-
-%%
-% Font for margin items
-
-\ifthenelse{\boolean{@tufte@sfsidenotes}}
-  {\newcommand{\@tufte@marginfont}{\normalfont\footnotesize\sffamily}}
-  {\newcommand{\@tufte@marginfont}{\normalfont\footnotesize}}
-
-
-%%
-% Set the justification baesed on the `justified' class option
-
-\newcommand{\@tufte@justification}{%
-  \ifthenelse{\boolean{@tufte@justified}}%
-    {\justifying}%
-    {\RaggedRight}%
-}
-
-%%
-% 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 implement full-width display environments
-
-\newboolean{@tufte@changepage}
-\IfFileExists{changepage.sty}{%
-  \PackageInfo{\@tufte@pkgname}{Found changepage.sty}
-  \RequirePackage[strict]{changepage}
-  \setboolean{@tufte@changepage}{true}
-}{%
-  \PackageInfo{\@tufte@pkgname}{Found chngpage.sty}
-  \RequirePackage[strict]{chngpage}
-  \setboolean{@tufte@changepage}{false}
-}
-
-% Write our own aliases for the \checkoddpage and \ifoddpage or \ifcpoddpage commands
-\newboolean{@tufte@odd@page}
-\setboolean{@tufte@odd@page}{true}
-\newcommand*{\@tufte@checkoddpage}{%
-  \checkoddpage%
-  \ifthenelse{\boolean{@tufte@changepage}}{%
-    \ifoddpage%
-      \setboolean{@tufte@odd@page}{true}%
-    \else%
-      \setboolean{@tufte@odd@page}{false}%
-    \fi%
-  }{%
-    \ifcpoddpage%
-      \setboolean{@tufte@odd@page}{true}%
-    \else%
-      \setboolean{@tufte@odd@page}{false}%
-    \fi
-  }%
-}
-
-
-% Compute lengths used for full-width displays
-
-\newlength{\@tufte@overhang}
-\setlength{\@tufte@overhang}{\marginparwidth}
-\addtolength{\@tufte@overhang}{\marginparsep}
-
-\newlength{\@tufte@fullwidth}
-\setlength{\@tufte@fullwidth}{\textwidth}
-\addtolength{\@tufte@fullwidth}{\marginparsep}
-\addtolength{\@tufte@fullwidth}{\marginparwidth}
-
-\newlength{\@tufte@caption@fill}
-\setlength{\@tufte@caption@fill}{\textwidth}
-\addtolength{\@tufte@caption@fill}{\marginparsep}
-
-
-%%
-% Modified \title, \author, and \date commands.  These store the
-% (footnote-less) values in \plaintitle, \plainauthor, and \thedate, respectively.
-
-\newcommand{\plaintitle}{}%     plain-text-only title
-\newcommand{\plainauthor}{}%    plain-text-only author
-\newcommand{\plainpublisher}{}% plain-text-only publisher
-
-\newcommand{\thanklesstitle}{}%     full title text minus \thanks{}
-\newcommand{\thanklessauthor}{}%    full author text minus \thanks{}
-\newcommand{\thanklesspublisher}{}% full publisher minus \thanks{}
-
-\newcommand{\@publisher}{}% full publisher with \thanks{}
-\newcommand{\thedate}{\today}
-
-% TODO Fix it so that \thanks is not spaced out (with `soul') and can be
-% used in \maketitle when the `sfsidenotes' option is provided.
-\renewcommand{\thanks}[1]{\NoCaseChange{\footnote{#1}}}
-
-\renewcommand{\title}[2][]{%
-  \gdef\@title{#2}%
-  \begingroup%
-    % TODO store contents of \thanks command
-    \renewcommand{\thanks}[1]{}% swallow \thanks contents
-    \protected@xdef\thanklesstitle{#2}%
-  \endgroup%
-  \ifthenelse{\isempty{#1}}%
-    {\renewcommand{\plaintitle}{\thanklesstitle}}% use thankless title
-    {\renewcommand{\plaintitle}{#1}}% use provided plain-text title
-  \hypersetup{pdftitle={\plaintitle}}% set the PDF metadata title
-}
-
-\def\@author{}% default author is empty (suppresses LaTeX's ``no author'' warning)
-\renewcommand*{\author}[2][]{%
-  \gdef\@author{#2}%
-  \begingroup%
-    % TODO store contents of \thanks command
-    \renewcommand{\thanks}[1]{}% swallow \thanks contents
-    \protected@xdef\thanklessauthor{#2}%
-  \endgroup%
-  \ifthenelse{\isempty{#1}}
-    {\renewcommand{\plainauthor}{\thanklessauthor}}% use thankless author
-    {\renewcommand{\plainauthor}{#1}}% use provided plain-text author
-  \hypersetup{pdfauthor={\plainauthor}}% set the PDF metadata author
-}
-
-\renewcommand*{\date}[1]{%
-  \gdef\@date{#1}%
-  \begingroup%
-    % TODO store contents of \thanks command
-    \renewcommand{\thanks}[1]{}% swallow \thanks contents
-    \protected@xdef\thedate{#1}%
-  \endgroup%
-}
-
-%%
-% Provides a \publisher command to set the publisher
-
-\newcommand{\publisher}[2][]{%
-  \gdef\@publisher{#2}%
-  \begingroup%
-    \renewcommand{\thanks}[1]{}% swallow \thanks contents
-    \protected@xdef\thanklesspublisher{#2}%
-  \endgroup%
-  \ifthenelse{\isempty{#1}}
-    {\renewcommand{\plainpublisher}{\thanklesspublisher}}% use thankless publisher
-    {\renewcommand{\plainpublisher}{#1}}% use provided plain-text publisher
-}
-
-% TODO: Test \hypersetup{pdfauthor,pdftitle} with DVI and XeTeX
-
-%%
-% Require paralist package for tighter lists
-
-\RequirePackage{paralist}
-
-% Add rightmargin to compactenum
-
-\def\@compactenum@{%
-  \expandafter\list\csname label\@enumctr\endcsname{%
-    \usecounter{\@enumctr}%
-    \rightmargin=2em% added this
-    \parsep\plparsep
-    \itemsep\plitemsep
-    \topsep\pltopsep
-    \partopsep\plpartopsep
-    \def\makelabel##1{\hss\llap{##1}}}}
-
-%%
-% Improved letterspacing of small caps and all-caps text.
-%
-% First, try to use the `microtype' package, if it's available. 
-% Failing that, try to use the `soul' package, if it's available.
-% Failing that, well, I give up.
-
-\RequirePackage{textcase} % provides \MakeTextUppercase and \MakeTextLowercase
-\def\allcapsspacing{\relax}
-\def\smallcapsspacing{\relax}
-\newcommand{\allcaps}[1]{\MakeTextUppercase{\allcapsspacing{#1}}}
-\newcommand{\smallcaps}[1]{\MakeTextLowercase{\textsc{#1}}}
-
-\newcommand{\@tufte@loadsoul}{%
-  \IfFileExists{soul.sty}{%
-    \RequirePackage{soul}
-    \sodef\allcapsspacing{\upshape}{0.15em}{0.65em}{0.6em}
-    \sodef\smallcapsspacing{\scshape}{0.075em}{0.5em}{0.6em}
-  }{
-    \PackageWarningNoLine{\@tufte@pkgname}{Couldn't locate `soul' package.}
-  }% soul not installed... giving up.
-}
-
-% If we're using pdfLaTeX v1.40+, use the letterspace package. 
-% If we're using pdfLaTex < v1.40, use the soul package.
-% If we're using XeLaTeX, use XeLaTeX letterspacing options.
-% Otherwise fall back on the soul package.
-
-\ifthenelse{\boolean{@tufte@pdf}}
-  {\PackageInfo{\@tufte@pkgname}{ifpdf = true}}
-  {\PackageInfo{\@tufte@pkgname}{ifpdf = false}}
-
-\ifthenelse{\boolean{@tufte@xetex}}
-  {\PackageInfo{\@tufte@pkgname}{ifxetex = true}}
-  {\PackageInfo{\@tufte@pkgname}{ifxetex = false}}
-
-% Check pdfLaTeX version
-\def\@tufte@pdftexversion{0}
-\ifx\normalpdftexversion\@undefined \else
-  \let\pdftexversion \normalpdftexversion
-  \let\pdftexrevision\normalpdftexrevision
-  \let\pdfoutput     \normalpdfoutput
-\fi
-\ifx\pdftexversion\@undefined \else
-  \ifx\pdftexversion\relax \else
-    \def\@tufte@pdftexversion{6}
-    \ifnum\pdftexversion < 140
-      \def\@tufte@pdftexversion{5}
-    \fi
-  \fi
-\fi
-
-\ifthenelse{\boolean{@tufte@letterspace}}
-  {%
-  \ifnum\@tufte@pdftexversion<6
-    % pdfLaTeX version is too old or not using pdfLaTeX
-    \ifthenelse{\boolean{@tufte@xetex}}
-      {% TODO use xetex letterspacing
-      \PackageInfo{\@tufte@pkgname}{XeTeX detected. Reverting to `soul' package for letterspacing.}
-      \@tufte@loadsoul}
-      {% use `soul' package for letterspacing
-      \PackageInfo{\@tufte@pkgname}{Old version of pdfTeX detected.  Reverting to `soul' package for letterspacing.}
-      \@tufte@loadsoul}
-  \else
-    \IfFileExists{letterspace.sty}{% 
-      \PackageInfo{\@tufte@pkgname}{Modern version of pdfTeX detected.  Using `letterspace' package.}
-      \RequirePackage{letterspace}
-      % Set up letterspacing (using microtype package) -- requires pdfTeX v1.40+
-      \renewcommand{\allcapsspacing}[1]{\textls[200]{##1}}
-      \renewcommand{\smallcapsspacing}[1]{\textls[50]{##1}}
-      \renewcommand{\allcaps}[1]{\textls[200]{\MakeTextUppercase{##1}}}
-      \renewcommand{\smallcaps}[1]{\textsc{\MakeTextLowercase{##1}}}
-    }{% microtype failed, check for soul
-      \PackageInfo{\@tufte@pkgname}{Modern version of pdfTeX detected, but `letterspace' package not installed.  Reverting to  `soul' package for letterspacing.}
-      \@tufte@loadsoul
-    }
-  \fi}
-  {}
-
-
-\DeclareTextFontCommand{\textsmallcaps}{\scshape}
-\renewcommand{\textsc}[1]{\textsmallcaps{\smallcapsspacing{#1}}}
-
-
-%%
-% An environment for paragraph-style section
-
-\providecommand\newthought[1]{%
-   \addvspace{1.0\baselineskip plus 0.5ex minus 0.2ex}%
-   \noindent\textsc{#1}%
-}
-
-%%
-% Redefine the display environments (quote, quotation, etc.)
-
-\renewenvironment{verse}
-               {\let\\\@centercr
-                \list{}{\itemsep      \z@
-                        \itemindent   -1pc%
-                        \listparindent\itemindent
-                        \rightmargin  \leftmargin
-                        \advance\leftmargin 1pc}%
-                \small%
-                \item\relax}
-               {\endlist}
-\renewenvironment{quotation}
-               {\list{}{\listparindent 1pc%
-                        \itemindent    \listparindent
-                        \rightmargin   \leftmargin
-                        \parsep        \z@ \@plus\p@}%
-                \small%
-                \item\relax\noindent\ignorespaces}
-               {\endlist}
-\renewenvironment{quote}
-               {\list{}{\rightmargin\leftmargin}%
-                \small%
-                \item\relax}
-               {\endlist}
-
-
-%%
-% Used for doublespacing, and other linespacing
-
-\RequirePackage{setspace}
-
-%%
-% Load the bidi package if instructed to do so.  This package must be loaded
-% prior to our redefining the \footnote and \cite commands.
-
-\ifthenelse{\boolean{@tufte@loadbidi}}{\RequirePackage{bidi}}{}
-
-
-%%
-% A function that removes leading and trailling spaces from the supplied macro.
-% Based on code written by Michael Downes (See ``Around the Bend'', #15.)
-% Executing \@tufte@trim@spaces\xyzzy will result in the contents of \xyzzy
-% being trimmed of leading and trailing white space.
-
-\catcode`\Q=3
-\def\@tufte@trim@spaces#1{%
-  % Use grouping to emulate a multi-token afterassignment queue
-  \begingroup%
-  % Put `\toks 0 {' into the afterassignment queue
-  \aftergroup\toks\aftergroup0\aftergroup{% 
-  % Apply \trimb to the replacement text of #1, adding a leading
-  % \noexpand to prevent brace stripping and to serve another purpose
-  % later.
-  \expandafter\@tufte@trim@b\expandafter\noexpand#1Q Q}%
-  % Transfer the trimmed text back into #1.
-  \edef#1{\the\toks0}%
-}
-
-% \trimb removes a trailing space if present, then calls \@tufte@trim@c to
-% clean up any leftover bizarre Qs, and trim a leading space. In
-% order for \trimc to work properly we need to put back a Q first.
-\def\@tufte@trim@b#1 Q{\@tufte@trim@c#1Q}
-
-% Execute \vfuzz assignment to remove leading space; the \noexpand
-% will now prevent unwanted expansion of a macro or other expandable
-% token at the beginning of the trimmed text. The \endgroup will feed
-% in the \aftergroup tokens after the \vfuzz assignment is completed.
-\def\@tufte@trim@c#1Q#2{\afterassignment\endgroup \vfuzz\the\vfuzz#1}
-\catcode`\Q=11
-
-%%
-% Citations should go in the margin as sidenotes
-
-\RequirePackage[numbers]{natbib}
-\RequirePackage{bibentry}        % allows bibitems to be typeset outside thebibliography environment
-% Redefine the \BR@b@bibitem command to fix a bug with bibentry+chicago style
-\renewcommand\BR@b@bibitem[2][]{%
-  \ifthenelse{\isempty{#1}}%
-    {\BR@bibitem{#2}}%
-    {\BR@bibitem[#1]{#2}}%
-  \BR@c@bibitem{#2}%
-}
-\nobibliography*                % pre-loads the bibliography keys
-\providecommand{\doi}[1]{\textsc{doi:} #1}% pre-defining this so it may be used before the \bibliography command it issued
-
-%%
-% Normal \cite behavior
-\newcounter{@tufte@num@bibkeys}%
-\newcommand{\@tufte@normal@cite}[2][0pt]{%
-  % Snag the last bibentry in the list for later comparison
-  \let\@temp@last@bibkey\@empty%
-  \@for\@temp@bibkey:=#2\do{\let\@temp@last@bibkey\@temp@bibkey}%
-  \sidenote[][#1]{%
-    % Loop through all the bibentries, separating them with semicolons and spaces
-    \setcounter{@tufte@num@bibkeys}{0}%
-    \@for\@temp@bibkeyx:=#2\do{%
-      \ifthenelse{\equal{\@temp@last@bibkey}{\@temp@bibkeyx}}%
-        {\ifthenelse{\equal{\value{@tufte@num@bibkeys}}{0}}{}{and\ }%
-         \@tufte@trim@spaces\@temp@bibkeyx% trim spaces around bibkey
-         \bibentry{\@temp@bibkeyx}}%
-        {\@tufte@trim@spaces\@temp@bibkeyx% trim spaces around bibkey
-         \bibentry{\@temp@bibkeyx};\ }%
-      \stepcounter{@tufte@num@bibkeys}%
-    }%
-  }%
-}
-
-
-%%
-% Macros for holding the list of cite keys until after the \sidenote
-
-\gdef\@tufte@citations{}% list of cite keys
-\newcommand\@tufte@add@citation[1]{\relax% adds a new bibkey to the list of cite keys
-  \ifx\@tufte@citations\@empty\else
-    \g@addto@macro\@tufte@citations{,}% separate by commas
-  \fi
-  \g@addto@macro\@tufte@citations{#1}
-}
-
-\newcommand{\@tufte@print@citations}[1][0pt]{% puts the citations in a margin note
-  % Snag the last bibentry in the list for later comparison
-  \let\@temp@last@bibkey\@empty%
-  \@for\@temp@bibkey:=\@tufte@citations\do{\let\@temp@last@bibkey\@temp@bibkey}%
-  \marginpar{%
-    \hbox{}\vspace*{#1}%
-    \@tufte@marginfont%
-    \@tufte@justification%
-    \@tufte@margin@par% use parindent and parskip settings for marginal text
-    \vspace*{-1\baselineskip}%
-    % Loop through all the bibentries, separating them with semicolons and spaces
-    \setcounter{@tufte@num@bibkeys}{0}%
-    \@for\@temp@bibkeyx:=\@tufte@citations\do{%
-      \ifthenelse{\equal{\@temp@last@bibkey}{\@temp@bibkeyx}}%
-        {\ifthenelse{\equal{\value{@tufte@num@bibkeys}}{0}}{}{and\ }%
-         \@tufte@trim@spaces\@temp@bibkeyx% trim spaces around bibkey
-         \bibentry{\@temp@bibkeyx}}%
-        {\@tufte@trim@spaces\@temp@bibkeyx% trim spaces around bibkey
-         \bibentry{\@temp@bibkeyx};\ }%
-      \stepcounter{@tufte@num@bibkeys}%
-    }%
-    \@tufte@reset@par% use parindent and parskip settings for body text
-  }%
-}
-
-%%
-% \cite behavior when executed within a sidenote
-
-\newcommand{\@tufte@sidenote@citations}{}% contains list of \cites in sidenote
-\newcommand{\@tufte@infootnote@cite}[1]{%
-  \@tufte@add@citation{#1}
-}
-
-%%
-% Set the default \cite style.  This is set and reset by the \sidenote command.
-
-\let\cite\@tufte@normal@cite
-
-%%
-% Transform existing \footnotes into \sidenotes
-% Sidenote: ``Where God meant footnotes to go.'' ---Tufte
-
-\RequirePackage{optparams}% for our new sidenote commands -- provides multiple optional arguments for commands
-
-\providecommand*{\footnotelayout}{\@tufte@marginfont\@tufte@justification}
-\renewcommand{\footnotelayout}{\@tufte@marginfont\@tufte@justification}
-
-% Override footmisc's definition to set the sidenote marks (numbers) inside the
-% sidenote's text block.
-\long\def\@makefntext#1{\@textsuperscript{\@tufte@marginfont\tiny\@thefnmark}\,\footnotelayout#1}
-
-% Set the in-text footnote mark in the same typeface as the body text itself.
-\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\footnotesize\@thefnmark}}}
-
-\providecommand*{\multiplefootnotemarker}{3sp}
-\providecommand*{\multfootsep}{,}
-
-\renewcommand*\@footnotemark{%
-  \leavevmode%
-  \ifhmode%
-    \edef\@x@sf{\the\spacefactor}%
-    \@tufte@check@multiple@sidenotes%
-    \nobreak%
-  \fi%
-  \@makefnmark%
-  \ifhmode\spacefactor\@x@sf\fi%
-  \relax%
-}
-
-\newcommand{\@tufte@check@multiple@sidenotes}{%
-  \ifdim\lastkern=\multiplefootnotemarker\relax%
-    \edef\@x@sf{\the\spacefactor}%
-    \unkern%
-    \textsuperscript{\multfootsep}%
-    \spacefactor\@x@sf\relax%
-  \fi
-}
-
-\renewcommand\@footnotetext[2][0pt]{%
-  \marginpar{%
-    \hbox{}\vspace*{#1}%
-    \def\baselinestretch {\setspace@singlespace}%
-    \ifthenelse{\boolean{@tufte@loadbidi}}{\if@rl@footnote\@rltrue\else\@rlfalse\fi}{}%
-    \reset@font\footnotesize%
-    \@tufte@margin@par% use parindent and parskip settings for marginal text
-    \vspace*{-1\baselineskip}\noindent%
-    \protected@edef\@currentlabel{%
-       \csname p@footnote\endcsname\@thefnmark%
-    }%
-    \color@begingroup%
-       \@makefntext{%
-         \ignorespaces#2%
-       }%
-    \color@endgroup%
-  }%
-  \@tufte@reset@par% use parindent and parskip settings for body text
-}%
-
-%
-% Define \sidenote command.  Can handle \cite.
-
-\newcommand{\@tufte@sidenote@vertical@offset}{0pt}
-
-% #1 = footnote num, #2 = vertical offset, #3 = footnote text
-\long\def\@tufte@sidenote[#1][#2]#3{%
-  \let\cite\@tufte@infootnote@cite%   use the in-sidenote \cite command
-  \gdef\@tufte@citations{}%           clear out any old citations
-  \ifthenelse{\NOT\isempty{#2}}{\renewcommand{\@tufte@sidenote@vertical@offset}{#2}}{}%
-  \ifthenelse{\isempty{#1}}{%
-    % no specific footnote number provided
-    \stepcounter\@mpfn%
-    \protected@xdef\@thefnmark{\thempfn}%
-    \@footnotemark\@footnotetext[\@tufte@sidenote@vertical@offset]{#3}%
-  }{%
-    % specific footnote number provided
-    \begingroup%
-      \csname c@\@mpfn\endcsname #1\relax%
-      \unrestored@protected@xdef\@thefnmark{\thempfn}%
-    \endgroup%
-    \@footnotemark\@footnotetext[\@tufte@sidenote@vertical@offset]{#3}%
-  }%
-  \@tufte@print@citations%            print any citations
-  \let\cite\@tufte@normal@cite%       go back to using normal in-text \cite command
-  \unskip\ignorespaces%               remove extra white space
-  \kern-\multiplefootnotemarker%      remove \kern left behind by sidenote
-  \kern\multiplefootnotemarker\relax% add new \kern here to replace the one we yanked
-}
-
-\newcommand*{\sidenote}{\optparams{\@tufte@sidenote}{[][0pt]}}
-\renewcommand*{\footnote}{\optparams{\@tufte@sidenote}{[][0pt]}}
-
-%%
-% Sidenote without the footnote mark
-
-\newcommand\marginnote[2][0pt]{%
-  \let\cite\@tufte@infootnote@cite%   use the in-sidenote \cite command
-  \gdef\@tufte@citations{}%           clear out any old citations
-  \@tufte@margin@par%                 use parindent and parskip settings for marginal text
-  \marginpar{\hbox{}\vspace*{#1}\@tufte@marginfont\@tufte@justification\vspace*{-1\baselineskip}\noindent #2}%
-  \@tufte@reset@par%                  use parindent and parskip settings for body text
-  \@tufte@print@citations%            print any citations
-  \let\cite\@tufte@normal@cite%       go back to using normal in-text \cite command
-}
-
-
-%%
-% The placeins package provides the \FloatBarrier command.  This forces
-% LaTeX to place all of the floats before proceeding.  We'll use this to
-% keep the float (figure and table) numbers in sequence.
-\RequirePackage{placeins}
-
-%%
-% Margin float environment
-
-\newsavebox{\@tufte@margin@floatbox}
-\newenvironment{@tufte@margin@float}[2][-1.2ex]%
-  {\FloatBarrier% process all floats before this point so the figure/table numbers stay in order.
-  \begin{lrbox}{\@tufte@margin@floatbox}%
-  \begin{minipage}{\marginparwidth}%
-    \@tufte@marginfont%
-    \def\@captype{#2}%
-    \hbox{}\vspace*{#1}%
-    \@tufte@justification%
-    \@tufte@margin@par%
-    \noindent%
-  }
-  {\end{minipage}%
-  \end{lrbox}%
-  \marginpar{\usebox{\@tufte@margin@floatbox}}%
-  \@tufte@reset@par%
-  }
-
-
-%%
-% Margin figure environment
-
-\newenvironment{marginfigure}[1][-1.2ex]%
-  {\begin{@tufte@margin@float}[#1]{figure}}
-  {\end{@tufte@margin@float}}
-
-
-%%
-% Margin table environment
-\newenvironment{margintable}[1][-1.2ex]%
-  {\begin{@tufte@margin@float}[#1]{table}}
-  {\end{@tufte@margin@float}}
-
-
-%%
-% A collection of macros to be used with the new Tufte-style float environments
-
-\newcommand{\floatalignment}{x}% holds the current float alignment (t, b, h, p)
-\newcommand{\setfloatalignment}[1]{\renewcommand{\floatalignment}{#1}}% manually sets the float alignment
-
-% Boxes to temporarily store our float and caption
-\newsavebox{\@tufte@figure@box}
-\newsavebox{\@tufte@caption@box}
-
-% Save original LaTeX float environment
-\let\@tufte@orig@float\@float
-\let\@tufte@orig@endfloat\end@float
-
-% Save original LaTeX \caption and \label commands
-\AtBeginDocument{%
-  \let\@tufte@orig@caption\caption%
-  \let\@tufte@orig@label\label%
-}
-
-% Store the caption and label contents
-\newcommand{\@tufte@stored@shortcaption}{}
-\newcommand{\@tufte@stored@caption}{}
-\newcommand{\@tufte@stored@label}{}
-
-\newcommand{\@tufte@caption}[2][]{%
-  \ifthenelse{\isempty{#1}}
-    {\gdef\@tufte@stored@shortcaption{#2}}%
-    {\gdef\@tufte@stored@shortcaption{#1}}%
-  \gdef\@tufte@stored@caption{#2}%
-}
-
-\newcommand{\@tufte@label}[1]{%
-  \gdef\@tufte@stored@label{#1}%
-}
-
-\newcommand{\@tufte@fps}{}
-
-% TODO make sure new caption and figure code can handle [p] and [h] placements well
-% TODO handle the symmetric class option (move caption to other side of verso pages)
-
-%%
-% Define a float environment to place the captions in the margin space
-
-\newenvironment{@tufte@float}[2][htbp]
-  {% If the float placement specifier is 'b' and only 'b', then bottom-align the mini-pages, otherwise top-align them.
-    \renewcommand{\@tufte@fps}{#1}%
-    \ifthenelse{\equal{#1}{b}\OR\equal{#1}{B}}%
-      {\renewcommand{\floatalignment}{b}}%
-      {\renewcommand{\floatalignment}{t}}%
-    \renewcommand{\caption}[2][]{\@tufte@caption[##1]{##2}}%
-    \renewcommand{\label}[1]{\@tufte@label{##1}}%
-    \@tufte@orig@float{#2}[#1]%
-    \begin{lrbox}{\@tufte@figure@box}%
-      \begin{minipage}[\floatalignment]{\textwidth}\hbox{}%
-  }
-  {% end @tufte@float
-        \par\hbox{}\vspace{-\baselineskip}\ifthenelse{\prevdepth>0}{\vspace{-\prevdepth}}{}% align baselines of boxes
-      \end{minipage}%
-    \end{lrbox}%
-    % build the caption box
-    \begin{lrbox}{\@tufte@caption@box}%
-      \begin{minipage}[\floatalignment]{\marginparwidth}\hbox{}%
-        \ifthenelse{\NOT\equal{\@tufte@stored@caption}{}}{\@tufte@orig@caption[\@tufte@stored@shortcaption]{\@tufte@stored@caption}}{}%
-        \ifthenelse{\NOT\equal{\@tufte@stored@label}{}}{\@tufte@orig@label{\@tufte@stored@label}}{}%
-        \par\vspace{-\prevdepth}%% TODO: DOUBLE-CHECK FOR SAFETY
-      \end{minipage}%
-    \end{lrbox}%
-    % now typeset the stored boxes
-    \begin{fullwidth}%
-      \begin{minipage}[\floatalignment]{\linewidth}%
-        \@tufte@checkoddpage%
-        \ifthenelse{\NOT\boolean{@tufte@symmetric}\OR\boolean{@tufte@odd@page}}{%
-          % asymmetric or page is odd, so caption is on the right
-          \usebox{\@tufte@figure@box}%
-          \hspace{\marginparsep}%
-          \smash{\usebox{\@tufte@caption@box}}%
-        }{%
-          % symmetric pages and page is even, so caption is on the left
-	  \strut\smash{\usebox{\@tufte@caption@box}}%
-          \hspace{\marginparsep}%
-	  \usebox{\@tufte@figure@box}%
-        }%
-      \end{minipage}%
-    \end{fullwidth}%
-    \@tufte@orig@endfloat%
-    % reset commands and temp boxes and captions
-    \let\caption\@tufte@orig@caption%
-    \let\label\@tufte@orig@label%
-    \begin{lrbox}{\@tufte@figure@box}\hbox{}\end{lrbox}%
-    \begin{lrbox}{\@tufte@caption@box}\hbox{}\end{lrbox}%
-    \gdef\@tufte@stored@shortcaption{}%
-    \gdef\@tufte@stored@caption{}%
-  }
-
-%%
-% Redefine the figure environment to place the captions in the margin space
-
-\renewenvironment{figure}[1][htbp]
-  {\begin{@tufte@float}[#1]{figure}}
-  {\end{@tufte@float}}
-
-
-%%
-% Redefine the table environment to place the captions in the margin space
-
-\renewenvironment{table}[1][htbp]
-  {\begin{@tufte@float}[#1]{table}}
-  {\end{@tufte@float}}
-
-
-%%
-% Full-width figures and tables
-
-\newenvironment{@tufte@float@star}[2][htbp]%
-  {% begin
-    % If the float placement specifier is 'b' and only 'b', then place the caption above the figure, else place the caption below the figure.
-    \renewcommand{\@tufte@fps}{#1}%
-    \ifthenelse{\equal{#1}{b}\OR\equal{#1}{B}}%
-      {\renewcommand{\floatalignment}{b}}%
-      {\renewcommand{\floatalignment}{t}}%
-    \renewcommand{\caption}[2][]{\@tufte@caption[##1]{##2}}%
-    \renewcommand{\label}[1]{\@tufte@label{##1}}%
-    \@tufte@orig@float{#2}[#1]%
-    \begin{lrbox}{\@tufte@figure@box}%
-      \begin{minipage}[\floatalignment]{\textwidth}\hbox{}%
-        \begin{fullwidth}
-  }%
-  {% end figure*
-          \par\hbox{}\vspace{-\baselineskip}\ifthenelse{\prevdepth>0}{\vspace{-\prevdepth}}{}% align baselines of boxes
-        \end{fullwidth}%
-      \end{minipage}%
-    \end{lrbox}%
-    % build the caption box
-    % TODO use \captionaboveskip and \captionbelowskip for spacing between caption and figure boxes
-    \begin{lrbox}{\@tufte@caption@box}%
-      \begin{minipage}[\floatalignment]{\marginparwidth}\hbox{}%
-        \ifthenelse{\NOT\equal{\@tufte@stored@caption}{}}{\@tufte@orig@caption[\@tufte@stored@shortcaption]{\@tufte@stored@caption}}{}%
-        \ifthenelse{\NOT\equal{\@tufte@stored@label}{}}{\@tufte@orig@label{\@tufte@stored@label}}{}%
-        \par\vspace{-\prevdepth}%% TODO: DOUBLE-CHECK FOR SAFETY
-      \end{minipage}%
-    \end{lrbox}%
-    % now typeset the stored boxes
-    \@tufte@checkoddpage%
-    \begin{fullwidth}%
-      \begin{minipage}[\floatalignment]{\linewidth}%
-        \ifthenelse{\equal{\floatalignment}{b}}
-          {% place caption above figure
-            \ifthenelse{\NOT\boolean{@tufte@symmetric}\OR\boolean{@tufte@odd@page}}
-              {% caption on the right
-                \hfill\smash{\usebox{\@tufte@caption@box}}%
-		\par\usebox{\@tufte@figure@box}%
-              }{% caption on the left
-                \smash{\usebox{\@tufte@caption@box}}\hfill\null%
-		\par\hspace{\@tufte@overhang}\usebox{\@tufte@figure@box}%
-              }%
-          }
-          {% place caption below figure
-            \ifthenelse{\NOT\boolean{@tufte@symmetric}\OR\boolean{@tufte@odd@page}}
-              {% caption on the right
-                \usebox{\@tufte@figure@box}\par%
-                \hspace{\@tufte@caption@fill}\smash{\usebox{\@tufte@caption@box}}%
-              }{% caption on the left
-                \null\hspace{\@tufte@overhang}\usebox{\@tufte@figure@box}\par%
-                \smash{\usebox{\@tufte@caption@box}}\hfill%
-              }%
-          }
-      \end{minipage}%
-    \end{fullwidth}%
-    \@tufte@orig@endfloat%
-    % reset commands and temp boxes and captions
-    \let\caption\@tufte@orig@caption%
-    \let\label\@tufte@orig@label%
-    \begin{lrbox}{\@tufte@figure@box}\hbox{}\end{lrbox}
-    \begin{lrbox}{\@tufte@caption@box}\hbox{}\end{lrbox}
-    \gdef\@tufte@stored@shortcaption{}
-    \gdef\@tufte@stored@caption{}
-  }
-
-
-%%
-% Full-width figure
-
-\renewenvironment{figure*}[1][htbp]%
-  {\begin{@tufte@float@star}[#1]{figure}}
-  {\end{@tufte@float@star}}
-
-
-%%
-% Full-width table
-
-\renewenvironment{table*}[1][htbp]%
-  {\begin{@tufte@float@star}[#1]{table}}
-  {\end{@tufte@float@star}}
-
-
-%%
-% Full-page-width area
-
-\newenvironment{fullwidth}
-  {\ifthenelse{\boolean{@tufte@symmetric}}
-     {\ifthenelse{\boolean{@tufte@changepage}}{\begin{adjustwidth*}{}{-\@tufte@overhang}}{\begin{adjustwidth}[]{}{-\@tufte@overhang}}}
-     {\begin{adjustwidth}{}{-\@tufte@overhang}}%
-  }
-  {\ifthenelse{\boolean{@tufte@symmetric}}
-    {\ifthenelse{\boolean{@tufte@changepage}}{\end{adjustwidth*}}{\end{adjustwidth}}}
-    {\end{adjustwidth}}
-  }
-
-%%
-% Format the captions in a style similar to the sidenotes
-
-\long\def\@caption#1[#2]#3{%
-  \par%
-  \addcontentsline{\csname ext@#1\endcsname}{#1}%
-    {\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}}%
-  \begingroup
-    \@parboxrestore
-    \if@minipage
-      \@setminipage
-    \fi
-    \@tufte@marginfont\@tufte@justification%
-    \noindent\csname fnum@#1\endcsname: \ignorespaces#3\par
-    %\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
-  \endgroup}
-
-%%
-% If we're NOT using XeLaTeX and the `nofonts' class option was NOT provided,
-% we should load the Palatino, Helvetica, and Bera Mono fonts (if they are
-% installed.)
-
-\ifthenelse{\boolean{@tufte@loadfonts}\AND\NOT\boolean{@tufte@xetex}}{%
-  \IfFileExists{mathpazo.sty}{\RequirePackage[osf,sc]{mathpazo}}{}
-  \IfFileExists{helvet.sty}{\RequirePackage[scaled=0.90]{helvet}}{}
-  \IfFileExists{beramono.sty}{\RequirePackage[scaled=0.85]{beramono}}{}
-  \RequirePackage[T1]{fontenc}
-  \RequirePackage{textcomp}
-}{}
-
-
-%%
-% Turns newlines into spaces.  Based on code from the `titlesec' package.
-
-\DeclareRobustCommand{\@tufte@newlinetospace}{%
-  \@ifstar{\@tufte@newlinetospace@i}{\@tufte@newlinetospace@i}%
-}
-
-\def\@tufte@newlinetospace@i{%
-  \ifdim\lastskip>\z@\else\space\fi
-  \ignorespaces%
-}
-
-\DeclareRobustCommand{\newlinetospace}[1]{%
-  \let\@tufte@orig@cr\\% save the original meaning of \\
-  \def\\{\@tufte@newlinetospace}% turn \\ and \\* into \space
-  \let\newline\\% turn \newline into \space
-  #1%
-  \let\\\@tufte@orig@cr% revert to original meaning of \\
-}
-
-
-%%
-% Sets up the running heads and folios.
-
-\RequirePackage{fancyhdr}
-
-% Set the default page style to 'fancy'
-\pagestyle{fancy}
-
-% Set the header/footer width to be the body text block plus the margin
-% note area.
-\ifthenelse{\boolean{@tufte@symmetric}}
-  {\fancyhfoffset[LE,RO]{\@tufte@overhang}}
-  {\fancyhfoffset[RE,RO]{\@tufte@overhang}}
-
-% The running heads/feet don't have rules
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{0pt}
-
-% The 'fancy' page style is the default style for all pages.
-\fancyhf{} % clear header and footer fields
-\ifthenelse{\boolean{@tufte@twoside}}
-  {\fancyhead[LE]{\thepage\quad\smallcaps{\newlinetospace{\plainauthor}}}%
-    \fancyhead[RO]{\smallcaps{\newlinetospace{\plaintitle}}\quad\thepage}}
-  {\fancyhead[RE,RO]{\smallcaps{\newlinetospace{\plaintitle}}\quad\thepage}}
-
-
-% The `plain' page style is used on chapter opening pages.
-% In Tufte's /Beautiful Evidence/ he never puts page numbers at the
-% bottom of pages -- the folios are unexpressed.
-\fancypagestyle{plain}{
-  \fancyhf{} % clear header and footer fields
-  % Uncomment the following five lines of code if you want the opening page
-  % of the chapter to express the folio in the lower outside corner.
-  %\ifthenelse{\boolean{@tufte@twoside}}
-  %  {\fancyfoot[LE,RO]{\thepage}}
-  %  {\fancyfoot[RE,RO]{\thepage}}
-}
-
-% The `empty' page style suppresses all headers and footers.
-% It's used on title pages and `intentionally blank' pages.
-\fancypagestyle{empty}{
-  \fancyhf{} % clear header and footer fields
-}
-
-
-%%
-% Set raggedright and paragraph indentation for document
-
-\AtBeginDocument{\@tufte@justification}
-
-
-%%
-% Prints the list of class options and their states.
-
-\newcommand{\typeoutbool}[2]{%
-  \ifthenelse{\boolean{#2}}
-    {\typeout{\space\space#1: true}}
-    {\typeout{\space\space#1: false}}
-}
-
-\newcommand{\typeoutstr}[2]{%
-  \typeout{\space\space#1: #2}
-}
-
-\newcommand{\PrintTufteSettings}{%
-  \typeout{-------------------- Tufte-LaTeX settings ----------}
-  \typeout{Class: \@tufte@pkgname}
-  \typeout{}
-  \typeout{Class options:}
-  \typeoutbool{a4paper}{@tufte@afourpaper}
-  \typeoutbool{load fonts}{@tufte@loadfonts}
-  \typeoutbool{fully-justified}{@tufte@justified}
-  \typeoutbool{letterspacing}{@tufte@letterspace}
-  \typeoutbool{sans-serif sidenotes}{@tufte@sfsidenotes}
-  \typeoutbool{symmetric margins}{@tufte@symmetric}
-  \typeoutbool{titlepage}{@tufte@titlepage}
-  \typeoutbool{twoside}{@tufte@twoside}
-  \typeoutbool{debug}{@tufte@debug}
-  \typeout{}
-  \typeout{Internal variables:}
-  \typeoutbool{[twoside]}{@twoside}
-  \typeoutbool{pdflatex}{@tufte@pdf}
-  \typeoutbool{xelatex}{@tufte@xetex}
-  \typeout{----------------------------------------------------}
-}
-
-
-
-%%
-% Color
-\RequirePackage[usenames,dvipsnames,svgnames]{xcolor}
-
-%%
-% Produces a full title page
-
-\newcommand{\maketitlepage}[0]{%
-  \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%
-}
-
-%%
-% Title block
-
-\renewcommand{\maketitle}{%
-  \newpage
-  \global\@topnum\z@% prevent floats from being placed at the top of the page
-  \begingroup
-  \setlength{\parindent}{0pt}
-  \setlength{\parskip}{4pt}
-  \ifthenelse{\boolean{@tufte@sfsidenotes}}
-    {\begingroup
-      % FIXME fails with \thanks
-      \sffamily
-      \par{\LARGE\allcaps{\@title}}
-      \ifthenelse{\equal{\@author}{}}{}{\par{\Large\allcaps{\@author}}}
-      \ifthenelse{\equal{\@date}{}}{}{\par{\Large\allcaps{\@date}}}
-    \endgroup}
-    {\begingroup
-      \par{\LARGE\textit{\@title}}
-      \ifthenelse{\equal{\@author}{}}{}{\par{\Large\textit{\@author}}}
-      \ifthenelse{\equal{\@date}{}}{}{\par{\Large\textit{\@date}}}
-    \endgroup}
-  \par
-  \endgroup
-  \thispagestyle{plain}% suppress the running head
-}
-
-
-%%
-% Title page (if the `titlepage' option was passed to the tufte-handout
-% class.)
-
-\ifthenelse{\boolean{@tufte@titlepage}}
-  {\renewcommand{\maketitle}{\maketitlepage}}
-  {}
-
-%%
-% When \cleardoublepage is called, produce a blank (empty) page -- i.e.,
-% without headers and footers
-\def\cleardoublepage{\clearpage\if@twoside\ifodd\c@page\else
-  \hbox{}
-  %\vspace*{\fill}
-  %\begin{center}
-  %  This page intentionally contains only this sentence.
-  %\end{center}
-  %\vspace{\fill}
-  \thispagestyle{empty}
-  \newpage
-  \if@twocolumn\hbox{}\newpage\fi\fi\fi}
-
-%%
-% Make Tuftian-style section headings and TOC formatting
-
-\RequirePackage{titlesec,titletoc}
-
-\titleformat{\chapter}%
-  [display]% shape
-  {\relax\ifthenelse{\NOT\boolean{@tufte@symmetric}}{\begin{fullwidth}}{}}% format applied to label+text
-  {\itshape\huge\thechapter}% label
-  {0pt}% horizontal separation between label and title body
-  {\huge\rm\itshape}% before the title body
-  [\ifthenelse{\NOT\boolean{@tufte@symmetric}}{\end{fullwidth}}{}]% after the title body
-
-\titleformat{\section}%
-  [hang]% shape
-  {\normalfont\Large\itshape}% format applied to label+text
-  {\thesection}% label
-  {1em}% horizontal separation between label and title body
-  {}% before the title body
-  []% after the title body
-
-\titleformat{\subsection}%
-  [hang]% shape
-  {\normalfont\large\itshape}% format applied to label+text
-  {\thesubsection}% label
-  {1em}% horizontal separation between label and title body
-  {}% before the title body
-  []% after the title body
-
-\titleformat{\paragraph}%
-  [runin]% shape
-  {\normalfont\itshape}% format applied to label+text
-  {\theparagraph}% label
-  {1em}% horizontal separation between label and title body
-  {}% before the title body
-  []% after the title body
-
-
-\titlespacing*{\chapter}{0pt}{50pt}{40pt}
-\titlespacing*{\section}{0pt}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
-\titlespacing*{\subsection}{0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus.2ex}
-  
-% Subsubsection and following section headings shouldn't be used.
-% See Bringhurst's _The Elements of Typography_, section 4.2.2.
-\renewcommand\subsubsection{%
-  \PackageError{\@tufte@pkgname}{\noexpand\subsubsection is undefined by this class.%
-    \MessageBreak See Robert Bringhurst's _The Elements of 
-    \MessageBreak Typographic Style_, section 4.2.2.
-    \MessageBreak \noexpand\subsubsection was used}
-    {From Bringhurst's _The Elements of Typographic Style_, section 4.2.2: Use as 
-    \MessageBreak many levels of headings as you need, no more and no fewer.  Also see the many 
-    \MessageBreak related threads on Ask E.T. at http://www.edwardtufte.com/.}
-}
-
-%\renewcommand\paragraph{%
-%  \PackageError{\@tufte@pkgname}{\noexpand\paragraph is undefined by this class.%
-%    \MessageBreak See Robert Bringhurst's _The Elements of 
-%    \MessageBreak Typographic Style_, section 4.2.2.
-%    \MessageBreak \noexpand\paragraph was used}
-%    {From Bringhurst's _The Elements of Typographic Style_, section 4.2.2: Use as 
-%    \MessageBreak many levels of headings as you need, no more and no fewer.  Also see the many 
-%    \MessageBreak related threads on Ask E.T. at http://www.edwardtufte.com/.}
-%}
-
-\renewcommand\subparagraph{%
-  \PackageError{\@tufte@pkgname}{\noexpand\subparagraph is undefined by this class.%
-    \MessageBreak See Robert Bringhurst's _The Elements of 
-    \MessageBreak Typographic Style_, section 4.2.2.
-    \MessageBreak \noexpand\subparagraph was used}
-    {From Bringhurst's _The Elements of Typographic Style_, section 4.2.2: Use as 
-    \MessageBreak many levels of headings as you need, no more and no fewer.  Also see the many 
-    \MessageBreak related threads on Ask E.T. at http://www.edwardtufte.com/.}
-}
-
-
-% Formatting for main TOC (printed in front matter)
-% {section} [left] {above} {before w/label} {before w/o label} {filler + page} [after]
-\ifthenelse{\boolean{@tufte@toc}}
-  {\titlecontents{chapter}%
-    [0em] % distance from left margin
-    {\begin{fullwidth}\fontsize{13pt}{18pt}\selectfont} % above (global formatting of entry)
-    {\contentslabel{2em}\rm\itshape} % before w/label (label = ``Chapter 1'')
-    {\rm\itshape} % before w/o label
-    {\rm\qquad\thecontentspage} % filler + page (leaders and page num)
-    [\vspace{1.5\baselineskip}\end{fullwidth}] % after
-  }
-  {}
-
-%\titlecontents{chapter}%
-%        [0em]% distance from left margin
-%        {\fontsize{12pt}{18pt}\selectfont}% above (global formatting of entry)
-%        {\textit}% before w/ label (label = ``Chapter 1'')
-%        {\textit}% before w/o label
-%        {\qquad\thecontentspage}% filler and page (leaders and page num)
-%        [\vspace{1.5\baselineskip}]% after
-
-
-
-%%
-% A handy command to disable hyphenation for short bits of text.
-% Borrowed from Peter Wilson's `hyphenat' package.
-
-\newlanguage\langwohyphens% define a language without hyphenation rules
-\newcommand{\nohyphens}[1]{{\language\langwohyphens #1}}% used for short bits of text
-\newcommand{\nohyphenation}{\language\langwohyphens}% can be used inside environments for longer text
-
-%%
-% The bibliography environment
-
-\setlength\bibindent{1.5em}
-\renewenvironment{thebibliography}[1]
-  {%
-    \ifthenelse{\equal{\@tufte@class}{book}}%
-      {\chapter{\bibname}}%
-      {\section*{\refname}}%
-%   \@mkboth{\MakeUppercase\bibname}{\MakeUppercase\bibname}%
-    \list{\@biblabel{\@arabic\c@enumiv}}%
-         {\settowidth\labelwidth{\@biblabel{#1}}%
-          \leftmargin\labelwidth
-          \advance\leftmargin\labelsep
-          \@openbib@code
-          \usecounter{enumiv}%
-          \let\p@enumiv\@empty
-          \renewcommand\theenumiv{\@arabic\c@enumiv}}%
-    \sloppy
-    \clubpenalty4000
-    \@clubpenalty \clubpenalty
-    \widowpenalty4000%
-    \sfcode`\.\@m%
-  }
-  {%
-    \def\@noitemerr
-    {\@latex@warning{Empty `thebibliography' environment}}%
-    \endlist%
-  }
-\renewcommand\newblock{\hskip .11em\@plus.33em\@minus.07em}
-
-
-%%
-% An index environment to mimic Tufte's indexes
-
-\RequirePackage{multicol}
-\renewenvironment{theindex}
-  {\begin{fullwidth}%
-    \small%
-    \ifthenelse{\equal{\@tufte@class}{book}}%
-      {\chapter{\indexname}}%
-      {\section*{\indexname}}%
-    \parskip0pt%
-    \parindent0pt%
-    \let\item\@idxitem%
-    \begin{multicols}{3}%
-  }
-  {\end{multicols}%
-    \end{fullwidth}%
-  }
-\renewcommand\@idxitem{\par\hangindent 2em}
-\renewcommand\subitem{\par\hangindent 3em\hspace*{1em}}
-\renewcommand\subsubitem{\par\hangindent 4em\hspace*{2em}}
-\renewcommand\indexspace{\par\addvspace{1.0\baselineskip plus 0.5ex minus 0.2ex}\relax}%
-\newcommand{\lettergroup}[1]{}% swallow the letter heading in the index
-
-
-%%
-% If debugging is enabled, print the Tufte-LaTeX options and the list of
-% files.
-
-\ifthenelse{\boolean{@tufte@debug}}
-  {\PrintTufteSettings\listfiles}
-  {}
-
-
-%%
-% If there is a `tufte-common-local.tex' file, load it up.
-
-\IfFileExists{tufte-common-local.tex}
-  {\input{tufte-common-local}}
-  {}
-
-
-%%
-% End of file
-\endinput
-
diff --git a/Master/texmf-dist/tex/latex/tufte-latex/tufte-handout.cls b/Master/texmf-dist/tex/latex/tufte-latex/tufte-handout.cls
index ca9ab630829..767f51890d5 100644
--- a/Master/texmf-dist/tex/latex/tufte-latex/tufte-handout.cls
+++ b/Master/texmf-dist/tex/latex/tufte-latex/tufte-handout.cls
@@ -1,27 +1,15 @@
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
 
-\ProvidesClass{tufte-handout}[2009/05/17 v3.0.0 Tufte-handout class]
+\ProvidesClass{tufte-handout}[2009/12/11 v3.5.0 Tufte-handout class]
 
 %%
-% The symmetric option forces twoside.
-\DeclareOption{symmetric}{%
-  \ExecuteOptions{twoside}
-  \PassOptionsToPackage{twoside}{tufte-common}
-  \PassOptionsToClass{twoside}{article}
-  \PackageInfo{tufte-handout}{Passing twoside to `article' class}
-}
+% Declare we're tufte-handout
+\newcommand{\@tufte@class}{article}% the base LaTeX class (defaults to the article/handout style)
+\newcommand{\@tufte@pkgname}{tufte-handout}% the name of the package (defaults to tufte-handout)
 
-\PassOptionsToPackage{handout}{tufte-common}
-\DeclareOption*{% pass options to tufte-common package and the article class
-  \PassOptionsToPackage{\CurrentOption}{tufte-common}
-  \PassOptionsToClass{\CurrentOption}{article}
-  \PackageInfo{tufte-handout}{Passing \CurrentOption\space to `article' class}
-}
-\ProcessOptions
-
-\LoadClass{article}
-
-\RequirePackage{tufte-common}
+%%
+% Load the common style elements
+\input{tufte-common.def}
 
 
 %%
@@ -41,7 +29,8 @@
 % If there is a `tufte-handout-local.tex' file, load it.
 
 \IfFileExists{tufte-handout-local.tex}
-  {\input{tufte-handout-local}}
+  {\input{tufte-handout-local}
+   \TufteInfoNL{Loading tufte-handout-local.tex}}
   {}
 
 
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index cd30cbfc83f..3dc049ad582 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1518,6 +1518,7 @@ $standardxmt='\.xmt';
 %specialmans = (
  'epstopdf'		=> 'epstopdf.1',
  'findhyph'		=> 'findhyph.1',
+ 'latexmk'		=> 'latexmk.1',
  'perltex'		=> 'perltex.1',
  'pkfix-helper'		=> 'pkfix-helper.1',
  'purifyeps'		=> 'purifyeps.1',
@@ -1553,6 +1554,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'purifyeps'	=> 'purifyeps.pdf',
  'revtex'	=> '00readme.tex|DOWNLOAD|README',	# already in doc
  'rsc'		=> $standardclean . '|jawltxdoc.sty',	# temp file for doc
+ 'tufte-latex'	=> $standardclean . '|.tds.zip$',
  'wsuipa'	=> $standardclean . '|.*pk$',		# premade pk files
 );