Kaynağa Gözat

* We now check for the ``changepage'' package first and use it if it's

available.  Otherwise we call back on the ``chngpage'' package.
* Changed \usepackage{setspace} to \RequirePackage{setspace}
* Added an optional vertical offset argument to \marginnote
* Fonts: We no longer use the deprecated ``palatino'' package -- only the
  ``mathpazo'' package.
* Fonts: We now automatically load the ``helvet'' package for a sans serif
  font, if it's available.
* Bug: Fixed a bug in the \maketitle command wherein it would globally reset
  the \parindent and \parskip values.


git-svn-id: https://tufte-latex.googlecode.com/svn/trunk@75 516e2f36-ce3a-0410-bea4-1d4a03f5df72
master
Kevin M. Godby 17 yıl önce
ebeveyn
işleme
e0d88de456
1 değiştirilmiş dosya ile 22 ekleme ve 12 silme
  1. +22
    -12
      tufte-common.sty

+ 22
- 12
tufte-common.sty Dosyayı Görüntüle

@@ -208,8 +208,14 @@
%% %%
% To implement full-width display environments % To implement full-width display environments


\RequirePackage[strict]{chngpage}
% TODO this package may be obsolete -- see the changepage package for a replacement
\newboolean{@tufte@changepage}
\IfFileExists{changepage.sty}{%
\RequirePackage[strict]{changepage}
\setboolean{@tufte@changepage}{true}
}{%
\RequirePackage[strict]{chngpage}
\setboolean{@tufte@changepage}{false}
}






@@ -401,8 +407,8 @@


%% %%
% Used for doublespacing, and other linespacing % Used for doublespacing, and other linespacing
% Note that setspace must be loaded before footmisc or it'll break sidenotes
\usepackage{setspace}
\RequirePackage{setspace}




%% %%
@@ -543,10 +549,10 @@
%% %%
% Sidenote without the footnote mark % Sidenote without the footnote mark


\providecommand\marginnote[1]{%
\providecommand\marginnote[2][0pt]{%
\let\cite\@tufte@infootnote@cite% use the in-sidenote \cite command \let\cite\@tufte@infootnote@cite% use the in-sidenote \cite command
\gdef\@tufte@citations{}% clear out any old citations \gdef\@tufte@citations{}% clear out any old citations
\marginpar{\@tufte@marginfont\@tufte@justification #1}%
\marginpar{\vspace*{#1}\@tufte@marginfont\@tufte@justification #2}%
\@tufte@print@citations% print any citations \@tufte@print@citations% print any citations
\let\cite\@tufte@normal@cite% go back to using normal in-text \cite command \let\cite\@tufte@normal@cite% go back to using normal in-text \cite command
} }
@@ -605,7 +611,7 @@
[htbp]% [htbp]%
{\@float{figure}[#1]% {\@float{figure}[#1]%
\ifthenelse{\boolean{@tufte@symmetric}} \ifthenelse{\boolean{@tufte@symmetric}}
{\begin{adjustwidth}[]{}{-\@tufte@overhang}}
{\ifthenelse{\boolean{@tufte@changepage}}{\begin{adjustwidth*}{}{-\@tufte@overhang}}{\begin{adjustwidth}[]{}{-\@tufte@overhang}}}
{\begin{adjustwidth}{}{-\@tufte@overhang}} {\begin{adjustwidth}{}{-\@tufte@overhang}}
\begin{minipage}{\linewidth}}% \begin{minipage}{\linewidth}}%
{\end{minipage}% {\end{minipage}%
@@ -619,7 +625,7 @@
[htbp]% [htbp]%
{\@float{table}[#1]% {\@float{table}[#1]%
\ifthenelse{\boolean{@tufte@symmetric}} \ifthenelse{\boolean{@tufte@symmetric}}
{\begin{adjustwidth}[]{}{-\@tufte@overhang}}
{\ifthenelse{\boolean{@tufte@changepage}}{\begin{adjustwidth*}{}{-\@tufte@overhang}}{\begin{adjustwidth}[]{}{-\@tufte@overhang}}}
{\begin{adjustwidth}{}{-\@tufte@overhang}} {\begin{adjustwidth}{}{-\@tufte@overhang}}
\begin{minipage}{\linewidth}}% \begin{minipage}{\linewidth}}%
{\end{minipage}% {\end{minipage}%
@@ -631,7 +637,7 @@


\newenvironment{fullwidth} \newenvironment{fullwidth}
{\ifthenelse{\boolean{@tufte@symmetric}} {\ifthenelse{\boolean{@tufte@symmetric}}
{\begin{adjustwidth}[]{}{-\@tufte@overhang}}
{\ifthenelse{\boolean{@tufte@changepage}}{\begin{adjustwidth*}{}{-\@tufte@overhang}}{\begin{adjustwidth}[]{}{-\@tufte@overhang}}}
{\begin{adjustwidth}{}{-\@tufte@overhang}} {\begin{adjustwidth}{}{-\@tufte@overhang}}
} }
{\end{adjustwidth}} {\end{adjustwidth}}
@@ -658,10 +664,12 @@
% compiling with XeLaTeX. % compiling with XeLaTeX.


\ifthenelse{\boolean{@tufte@loadfonts}\AND\NOT\boolean{@tufte@xetex}}{% \ifthenelse{\boolean{@tufte@loadfonts}\AND\NOT\boolean{@tufte@xetex}}{%
\IfFileExists{palatino.sty}{%
\RequirePackage{palatino}
\IfFileExists{mathpazo.sty}{\RequirePackage[osf,sc]{mathpazo}}{}
\IfFileExists{mathpazo.sty}{%
\RequirePackage[osf,sc]{mathpazo}
}{} % if the Palatino typefaces aren't found, do nothing. }{} % if the Palatino typefaces aren't found, do nothing.
\IfFileExists{helvet.sty}{%
\RequirePackage[scaled=0.95]{helvet}
}{}
}{} }{}




@@ -823,6 +831,7 @@
\renewcommand{\maketitle}{% \renewcommand{\maketitle}{%
\newpage \newpage
\global\@topnum\z@% prevent floats from being placed at the top of the page \global\@topnum\z@% prevent floats from being placed at the top of the page
\begingroup
\setlength{\parindent}{0pt} \setlength{\parindent}{0pt}
\setlength{\parskip}{4pt} \setlength{\parskip}{4pt}
\ifthenelse{\boolean{@tufte@sfsidenotes}} \ifthenelse{\boolean{@tufte@sfsidenotes}}
@@ -839,6 +848,7 @@
\ifthenelse{\equal{\@date}{}}{}{\par{\large\textit{\@date}}} \ifthenelse{\equal{\@date}{}}{}{\par{\large\textit{\@date}}}
\endgroup} \endgroup}
\par \par
\endgroup
\thispagestyle{plain}% suppress the running head \thispagestyle{plain}% suppress the running head
} }




Yükleniyor…
İptal
Kaydet