|
|
@@ -262,22 +262,11 @@ |
|
|
% keep the float (figure and table) numbers in sequence. |
|
|
% keep the float (figure and table) numbers in sequence. |
|
|
\RequirePackage{placeins} |
|
|
\RequirePackage{placeins} |
|
|
|
|
|
|
|
|
%% |
|
|
|
|
|
% Margin figure |
|
|
|
|
|
|
|
|
|
|
|
\newcommand{\marginfigure}[2]% |
|
|
|
|
|
[-1.2ex]% |
|
|
|
|
|
{\FloatBarrier% process all floats before this point so the figure numbers stay in order. |
|
|
|
|
|
\marginpar{\@tufteh@marginfont |
|
|
|
|
|
\def\@captype{figure} |
|
|
|
|
|
\vspace*{#1} |
|
|
|
|
|
\@tufteh@raggedright #2}} |
|
|
|
|
|
|
|
|
|
|
|
%% |
|
|
%% |
|
|
% Margin figure environment |
|
|
% Margin figure environment |
|
|
|
|
|
|
|
|
\newsavebox{\@tufteh@marginfigbox} |
|
|
\newsavebox{\@tufteh@marginfigbox} |
|
|
\newenvironment{marginfig}[1] |
|
|
|
|
|
|
|
|
\newenvironment{marginfigure}[1] |
|
|
[-1.2ex] |
|
|
[-1.2ex] |
|
|
{\FloatBarrier% process all floats before this point so the figure numbers stay in order. |
|
|
{\FloatBarrier% process all floats before this point so the figure numbers stay in order. |
|
|
\begin{lrbox}{\@tufteh@marginfigbox} |
|
|
\begin{lrbox}{\@tufteh@marginfigbox} |
|
|
@@ -292,22 +281,10 @@ |
|
|
\marginpar{\usebox{\@tufteh@marginfigbox}}} |
|
|
\marginpar{\usebox{\@tufteh@marginfigbox}}} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%% |
|
|
|
|
|
% Margin table |
|
|
|
|
|
|
|
|
|
|
|
\newcommand{\margintable}[2]% |
|
|
|
|
|
[-1.2ex]% |
|
|
|
|
|
{\FloatBarrier% process all floats before this point so the table numbers stay in order. |
|
|
|
|
|
\marginpar{\@tufteh@marginfont |
|
|
|
|
|
\def\@captype{table} |
|
|
|
|
|
\vspace*{#1} |
|
|
|
|
|
\@tufteh@raggedright #2}} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%% |
|
|
%% |
|
|
% Margin table environment |
|
|
% Margin table environment |
|
|
\newsavebox{\@tufteh@margintablebox} |
|
|
\newsavebox{\@tufteh@margintablebox} |
|
|
\newenvironment{margintab}[1] |
|
|
|
|
|
|
|
|
\newenvironment{margintable}[1] |
|
|
[-1.2ex] |
|
|
[-1.2ex] |
|
|
{\FloatBarrier% process all floats before this point so the figure numbers stay in order. |
|
|
{\FloatBarrier% process all floats before this point so the figure numbers stay in order. |
|
|
\begin{lrbox}{\@tufteh@margintablebox} |
|
|
\begin{lrbox}{\@tufteh@margintablebox} |
|
|
|