From d9deba85170b8994f73e7e799dba4f3bda9f18a7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Apr 2012 16:25:47 +0000 Subject: marginnote (8apr12) git-svn-id: svn://tug.org/texlive/trunk@25880 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/marginnote/marginnote.sty | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty index 0908db41ad9..1f13ac1d3cf 100644 --- a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty +++ b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty @@ -12,7 +12,7 @@ %% without the source ot the work. See below about more informations %% about the files the work consists of. %% -%% Copyright (c) Markus Kohm 2005-2010 +%% Copyright (c) Markus Kohm 2005-2012 %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -35,7 +35,7 @@ %% the Work (see ``Important Recommendations'' at lppl.txt). %% \ProvidesPackage{marginnote}[% - 2010/01/05 v1.1f non floating margin notes for LaTeX] + 2012/03/29 v1.1i non floating margin notes for LaTeX] \begingroup \def\@tempb{}% \def\@tempa{% @@ -261,7 +261,7 @@ \@ifnextchar [{\@mn@@marginnote[{#1}]{#2}}{\@mn@@marginnote[{#1}]{#2}[\z@]}% } \newcommand{\@mn@@marginnote}{} -\def\@mn@@marginnote[#1]#2[#3]{% +\long\def\@mn@@marginnote[#1]#2[#3]{% \endgroup \ifhmode \@mn@@@marginnote[{#1}]{#2}[{#3}]% @@ -271,7 +271,7 @@ \fi } \newcommand{\@mn@@@marginnote}{} -\def\@mn@@@marginnote[#1]#2[#3]{% +\long\def\@mn@@@marginnote[#1]#2[#3]{% \begingroup \ifmmode\mn@strut\let\@tempa\mn@vadjust\else \if@inlabel\leavevmode\fi @@ -328,8 +328,10 @@ \vbox to\z@{\kern\marginnotevadjust\kern #3 \vbox to\z@{% \hsize\marginparwidth + \linewidth\hsize \kern-\parskip - \marginfont\raggedrightmarginnote\hspace{\z@}\strut#2\endgraf + \marginfont\raggedrightmarginnote\strut\hspace{\z@}% + \ignorespaces#2\endgraf \vss}% \vss}% }% @@ -338,8 +340,10 @@ \vbox to\z@{\kern\marginnotevadjust\kern #3 \vbox to\z@{% \hsize\marginparwidth + \linewidth\hsize \kern-\parskip - \marginfont\raggedleftmarginnote\hspace{\z@}\strut#1\endgraf + \marginfont\raggedleftmarginnote\strut\hspace{\z@}% + \ignorespaces#1\endgraf \vss}% \vss}% \ifx\@mn@currxpos\relax -- cgit v1.2.3