From f5ec7663e4ecfd2a80d92eddc8d0290d5f511f7a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 May 2009 15:58:35 +0000 Subject: marginnote update (9may09) git-svn-id: svn://tug.org/texlive/trunk@13031 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/marginnote/marginnote.pdf | Bin 150168 -> 154301 bytes Master/texmf-dist/source/latex/marginnote/README | 2 +- .../source/latex/marginnote/marginnote.dtx | 55 +++++++++++++++++++-- .../texmf-dist/tex/latex/marginnote/marginnote.sty | 37 +++++++++++++- 4 files changed, 88 insertions(+), 6 deletions(-) diff --git a/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf b/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf index 62ec3aaa7f8..e9477e37130 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 e209a81b8fb..9f338a69e73 100644 --- a/Master/texmf-dist/source/latex/marginnote/README +++ b/Master/texmf-dist/source/latex/marginnote/README @@ -2,7 +2,7 @@ Package marginnote Copyright (c) Markus Kohm 2005-2009 Licence: LPPL -Version: 2009/02/26 v1.1c +Version: 2009/05/06 v1.1d ---------------------------------------------------------------------------- This package provides the command \marginnote that may be used instead of \marginpar at almost every place, where \marginpar cannot be used, e.g. diff --git a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx index b5c6ee69ccc..f0b79ab571d 100644 --- a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx +++ b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx @@ -1,4 +1,4 @@ -% \CheckSum{578} +% \CheckSum{662} % \iffalse meta-comment % % marginnote.dtx @@ -31,7 +31,7 @@ % %\ProvidesPackage{marginnote}[% %<*driver|package> - 2009/02/26 v1.1c non floating margin notes for LaTeX] + 2009/05/06 v1.1d non floating margin notes for LaTeX] % %<*driver> \documentclass{ltxdoc} @@ -203,7 +203,8 @@ % % Sometimes lines are stretched vertically using \cs{marginnote}, e.g.\ if % you're using \cs{marginnote} at a list \emph{and} upper case umlauts like -% ``\"U''. In this case \verb|\lineskiplimit=-\maxdimen| should help. +% ``\"U'' or if \verb|\lineskiplimit>0pt|. In this case +% \verb|\lineskiplimit=-\maxdimen| should help. % % You should not use \cs{marginnote} at the optional argument of \cs{item}. % @@ -216,7 +217,35 @@ %<*package> % \fi % -% First declare and process the options. +% First test $\varepsilon$-\TeX. +% \begin{macrocode} +\begingroup + \def\@tempb{}% + \def\@tempa{% + \PackageError{marginnote}{seems you are not running e-TeX\@tempb}{% + Since 2004 the LaTeX team recommends to use e-TeX.\MessageBreak + marginnote since version 1.1d uses e-TeX features.\MessageBreak + At actual systems `latex' should already use e-TeX.\MessageBreak + At deprecated systems it may be called `elatex'.\MessageBreak + Use either unsupported marginnote up to version 1.1c or\MessageBreak + ask you administrator for LaTeX using e-TeX\@tempb.\MessageBreak + Not using e-TeX\@tempb\space is a fatal error!\MessageBreak + Processing cannot be continued!}% + \endgroup + \batchmode \errmessage{}\csname @@end\endcsname\end\relax + \csname endinput\endcsname + }% + \expandafter\ifx\csname eTeXversion\endcsname\relax\else + \ifnum\eTeXversion <2 + \def\@tempb{ V 2}% + \else + \let\@tempa\endgroup + \fi + \fi +\@tempa +% \end{macrocode} +% +% Next declare and process the options. % % \begin{macro}{\if@mn@verbose} % Use verbose output mode by default. But you may change this using option @@ -409,6 +438,24 @@ \edef\@mn@currpage{\csname mn@note.\@mn@thispage.\@mn@atthispage\endcsname}% \edef\@mn@currxpos{\expandafter\@secondoftwo\@mn@currpage}% +% \end{macrocode} +% \changes{v1.1d}{2009/05/06}{take care of \cs{hoffset}}% +% Ulrike Fischer suggested a simple change to take care of \cs{hoffset}, +% e.g., using package \textsf{crop}. +% \changes{v1.1d}{2009/05/06}{take care of \cs{pdfhorigin}}% +% We use this occasion to take care of \cs{pdfhorigin}, too. +% \begin{macrocode} + \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\hoffset\relax}% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfhorigin\endcsname\relax\else + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfoutput\endcsname\relax\else + \ifnum \pdfoutput=1 % + \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin + +1in\relax}% + \fi + \fi + \fi \edef\@mn@currpage{\expandafter\@firstoftwo\@mn@currpage}% \if@mn@verbose \PackageInfo{marginnote}{Margin note \@mn@thispage.\@mn@atthispage\space diff --git a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty index 7dbbe9a420d..c03e5406bd6 100644 --- a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty +++ b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty @@ -35,7 +35,31 @@ %% the Work (see ``Important Recommendations'' at lppl.txt). %% \ProvidesPackage{marginnote}[% - 2009/02/26 v1.1c non floating margin notes for LaTeX] + 2009/05/06 v1.1d non floating margin notes for LaTeX] +\begingroup + \def\@tempb{}% + \def\@tempa{% + \PackageError{marginnote}{seems you are not running e-TeX\@tempb}{% + Since 2004 the LaTeX team recommends to use e-TeX.\MessageBreak + marginnote since version 1.1d uses e-TeX features.\MessageBreak + At actual systems `latex' should already use e-TeX.\MessageBreak + At deprecated systems it may be called `elatex'.\MessageBreak + Use either unsupported marginnote up to version 1.1c or\MessageBreak + ask you administrator for LaTeX using e-TeX\@tempb.\MessageBreak + Not using e-TeX\@tempb\space is a fatal error!\MessageBreak + Processing cannot be continued!}% + \endgroup + \batchmode \errmessage{}\csname @@end\endcsname\end\relax + \csname endinput\endcsname + }% + \expandafter\ifx\csname eTeXversion\endcsname\relax\else + \ifnum\eTeXversion <2 + \def\@tempb{ V 2}% + \else + \let\@tempa\endgroup + \fi + \fi +\@tempa \newif\if@mn@verbose\@mn@verbosetrue \DeclareOption{verbose}{\@mn@verbosetrue} \DeclareOption{quiet}{\@mn@verbosefalse} @@ -141,6 +165,17 @@ \edef\@mn@currpage{\csname mn@note.\@mn@thispage.\@mn@atthispage\endcsname}% \edef\@mn@currxpos{\expandafter\@secondoftwo\@mn@currpage}% + \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\hoffset\relax}% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfhorigin\endcsname\relax\else + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdfoutput\endcsname\relax\else + \ifnum \pdfoutput=1 % + \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin + +1in\relax}% + \fi + \fi + \fi \edef\@mn@currpage{\expandafter\@firstoftwo\@mn@currpage}% \if@mn@verbose \PackageInfo{marginnote}{Margin note \@mn@thispage.\@mn@atthispage\space -- cgit v1.2.3