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 --- .../texmf-dist/doc/latex/marginnote/marginnote.pdf | Bin 308475 -> 288983 bytes Master/texmf-dist/source/latex/marginnote/README | 6 ++-- .../source/latex/marginnote/marginnote.dtx | 35 +++++++++++++++------ .../source/latex/marginnote/marginnote.ins | 4 +-- .../texmf-dist/tex/latex/marginnote/marginnote.sty | 16 ++++++---- 5 files changed, 40 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf b/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf index 7392c76c0de..4ae9cf65bd3 100644 Binary files a/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf and b/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf differ diff --git a/Master/texmf-dist/source/latex/marginnote/README b/Master/texmf-dist/source/latex/marginnote/README index 16b4be24fed..589d0223698 100644 --- a/Master/texmf-dist/source/latex/marginnote/README +++ b/Master/texmf-dist/source/latex/marginnote/README @@ -1,8 +1,8 @@ ---------------------------------------------------------------------------- Package marginnote -Copyright (c) Markus Kohm 2005-2010 +Copyright (c) Markus Kohm 2005-2012 Licence: LPPL -Version: 2010/01/05 v1.1f +Version: 2012/03/29 v1.1i ---------------------------------------------------------------------------- This package provides the command \marginnote that may be used instead of \marginpar at almost every place, where \marginpar cannot be used, e.g. @@ -43,7 +43,7 @@ marginnote.pdf (optional) and README, you have to call: and follow the instructions. NOTE: README is part of the sources of the Work. To produce a legal and -valid distribution if the Work, you need only the source files +valid distribution of the Work, you need only the source files `marginnote.dtx', `marginnote.ins', and `README'. You are not allowed to distribute any of these without the others. You are not allowed to distribute the generated files `marginnote.sty' or `marginnote.pdf' without 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 @@ % %\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> \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 diff --git a/Master/texmf-dist/source/latex/marginnote/marginnote.ins b/Master/texmf-dist/source/latex/marginnote/marginnote.ins index 585478cb429..f81ff40b438 100644 --- a/Master/texmf-dist/source/latex/marginnote/marginnote.ins +++ b/Master/texmf-dist/source/latex/marginnote/marginnote.ins @@ -1,7 +1,7 @@ % % marginnote.ins % -%% 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 @@ -60,4 +60,4 @@ about the files the work consists of. \Msg{*********************************************************************} } -\endinput \ No newline at end of file +\endinput 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