* Fixes bug reported by Joachim where using \sidenote inside the 'verse'

environment would cause indentation problems.  Hopefully this doesn't break
  other things.


git-svn-id: https://tufte-latex.googlecode.com/svn/trunk@140 516e2f36-ce3a-0410-bea4-1d4a03f5df72

tufte-common.def

@@ -392,13 +392,15 @@
 %%
 % \RaggedRight allows hyphenation
 
+\setlength{\parindent}{1.0pc}%
+\setlength{\parskip}{0pt}%
 \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{\JustifyingParindent}{1.0pc}%
   \setlength{\parindent}{1pc}%
   \setlength{\parskip}{0pt}%
 }
@@ -407,6 +409,7 @@
 % Paragraph indentation and separation for marginal text
 \newcommand{\@tufte@margin@par}{%
   \setlength{\RaggedRightParindent}{0.5pc}%
+  \setlength{\JustifyingParindent}{0.5pc}%
   \setlength{\parindent}{0.5pc}%
   \setlength{\parskip}{0pt}%
 }
@@ -893,7 +896,6 @@
          \bibentry{\@temp@bibkeyx};\ }%
       \stepcounter{@tufte@num@bibkeys}%
     }%
-    \@tufte@reset@par% use parindent and parskip settings for body text
   }%
 }
 
@@ -967,7 +969,6 @@
        }%
     \color@endgroup%
   }%
-  \@tufte@reset@par% use parindent and parskip settings for body text
 }%
 
 %
@@ -1014,9 +1015,7 @@
 \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@marginnote@font\@tufte@marginnote@justification\vspace*{-1\baselineskip}\noindent #2}%
-  \@tufte@reset@par%                  use parindent and parskip settings for body text
+  \marginpar{\hbox{}\vspace*{#1}\@tufte@marginnote@font\@tufte@marginnote@justification\@tufte@margin@par\vspace*{-1\baselineskip}\noindent #2}%
   \@tufte@print@citations%            print any citations
   \let\cite\@tufte@normal@cite%       go back to using normal in-text \cite command
 }
@@ -1046,7 +1045,6 @@
   {\end{minipage}%
   \end{lrbox}%
   \marginpar{\usebox{\@tufte@margin@floatbox}}%
-  \@tufte@reset@par%
   }