summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/marginnote/marginnote.dtx')
-rw-r--r--Master/texmf-dist/source/latex/marginnote/marginnote.dtx35
1 files changed, 25 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
index 42328574023..28ce99da42d 100644
--- a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
+++ b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
@@ -1,9 +1,9 @@
-% \CheckSum{757}
+% \CheckSum{765}
% \iffalse meta-comment
%
% marginnote.dtx
%
-%% 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
@@ -31,7 +31,7 @@
%</driver>
%<package>\ProvidesPackage{marginnote}[%
%<*driver|package>
- 2010/01/05 v1.1f non floating margin notes for LaTeX]
+ 2012/03/29 v1.1i non floating margin notes for LaTeX]
%</driver|package>
%<*driver>
\documentclass{ltxdoc}
@@ -94,7 +94,7 @@
% \end{description}
%
% \DescribeMacro{\marginnote}
-% The command \cs{marginnote}\oarg{left}\marg{right}\oarg{voffset} my be used
+% The command \cs{marginnote}\oarg{left}\marg{right}\oarg{voffset} may be used
% to set a margin note using \textsf{marginnote}. The first optional argument
% and the mandatory argument are same using \cs{marginpar} from the \LaTeX{}
% kernel. Even \cs{reversemarginpar} will be considered. The note \meta{left}
@@ -577,8 +577,10 @@
% \begin{macro}{\marginnote}
% \begin{macro}{\@mn@marginnote}
% \begin{macro}{\@mn@@marginnote}
+% \changes{v1.1g}{2011/04/11}{missing \cs{long} added}
% \begin{macro}{\@mn@@@marginnote}
% \changes{v1.1}{2006/10/23}{new PDF mode feature}
+% \changes{v1.1g}{2011/04/11}{missing \cs{long} added}
% Command \cs{marginnote} is the main macro of the package. The others are
% helpers to manage the optional arguments.
% \begin{macrocode}
@@ -598,7 +600,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
% \end{macrocode}
% In horizontal mode the space hack of the \LaTeX{} kernel will be used. In
@@ -612,7 +614,7 @@
\fi
}
\newcommand{\@mn@@@marginnote}{}
-\def\@mn@@@marginnote[#1]#2[#3]{%
+\long\def\@mn@@@marginnote[#1]#2[#3]{%
% \end{macrocode}
% \changes{v1.1b}{2009/02/16}{use \cs{mn@vadjust} instead of \cs{vadjust}}%
% \changes{v1.1e}{2009/06/06}{use \cs{mn@strut} instead of \cs{strut}}%
@@ -692,10 +694,18 @@
\vbox to\z@{%
\hsize\marginparwidth
% \end{macrocode}
-% Here's the correction of the vertical position. The rest is simple.
+% \changes{v1.1g}{2011/04/11}{set \cs{linewidth}}
+% \begin{macrocode}
+ \linewidth\hsize
+% \end{macrocode}
+% Here's the correction of the vertical position. The remain is simple.
+% \changes{v1.1i}{2012/03/29}{\cs{strut} moved to fix hyphenation (thanks to
+% Ulrike Fischer)}
+% \changes{v1.1i}{2012/03/29}{\cs{ignorespaces} added}
% \begin{macrocode}
\kern-\parskip
- \marginfont\raggedrightmarginnote\hspace{\z@}\strut#2\endgraf
+ \marginfont\raggedrightmarginnote\strut\hspace{\z@}%
+ \ignorespaces#2\endgraf
\vss}%
\vss}%
}%
@@ -710,10 +720,15 @@
\vbox to\z@{%
\hsize\marginparwidth
% \end{macrocode}
+% \changes{v1.1g}{2011/04/11}{set \cs{linewidth}}
+% \begin{macrocode}
+ \linewidth\hsize
+% \end{macrocode}
% Same like above for left margins.
% \begin{macrocode}
\kern-\parskip
- \marginfont\raggedleftmarginnote\hspace{\z@}\strut#1\endgraf
+ \marginfont\raggedleftmarginnote\strut\hspace{\z@}%
+ \ignorespaces#1\endgraf
\vss}%
\vss}%
\ifx\@mn@currxpos\relax
@@ -839,4 +854,4 @@
%%% mode: doc-tex
%%% TeX-master: t
%%% End:
-% \fi \ No newline at end of file
+% \fi