From 6df257f02cd9ad738897e88f139cb287e6247ece Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 9 Aug 2018 20:57:55 +0000 Subject: marginnote (9aug18) git-svn-id: svn://tug.org/texlive/trunk@48383 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/marginnote/README.txt | 2 +- .../texmf-dist/doc/latex/marginnote/marginnote.pdf | Bin 313336 -> 317456 bytes .../source/latex/marginnote/marginnote.dtx | 70 +++++++++++++++------ .../texmf-dist/tex/latex/marginnote/marginnote.sty | 10 ++- 4 files changed, 58 insertions(+), 24 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/marginnote/README.txt b/Master/texmf-dist/doc/latex/marginnote/README.txt index 188a76367ac..f75b9dc614f 100644 --- a/Master/texmf-dist/doc/latex/marginnote/README.txt +++ b/Master/texmf-dist/doc/latex/marginnote/README.txt @@ -2,7 +2,7 @@ LaTeX package marginnote Copyright (c) Markus Kohm, 2005-2018 ------------------------------------------------------------------- Version: - 2018/07/01 v1.4a + 2018/08/09 v1.4b Licence: This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, version 1.3c of the license. diff --git a/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf b/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf index 485994fe07d..f5150c99c3e 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/marginnote.dtx b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx index c3b9c606dde..9346c2a1db3 100644 --- a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx +++ b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx @@ -1,4 +1,4 @@ -% \CheckSum{783} +% \CheckSum{787} % \iffalse meta-comment % ====================================================================== % marginnote.dtx @@ -13,22 +13,31 @@ % and version 1.3c or later is part of all distributions of LaTeX % version 2005/12/01 or later and of this work. % -% This work has the LPPL maintenance status "maintained". -% -% The Current Maintainer and author of this work is Markus Kohm. +% This work has the LPPL maintenance status "unmaintained". +% If you want to become the new maintainer please contact the author. % % This work consists of the files marginnote.dtx and the % derived files README.txt and marginnote.sty. +% ---------------------------------------------------------------------- +% Note: This file is not only the source but also the docstrip batch +% file. To unpack marginnote.sty and README.txt from the source, +% run: +% +% tex marginnote.dtx +% +% as usual. You can replace tex by pdftex, luatex or xetex. +% Usage of latex, pdflatex, lualatex or xelatex produces the +% manual marginnote.pdf. % ====================================================================== % -%%%% From File: $Id: marginnote.dtx 23 2018-07-21 11:35:52Z mjk $ +%%%% From File: $Id: marginnote.dtx 27 2018-08-09 09:17:04Z mjk $ %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2018-07-21 13:35:52 +0200 (Sa, 21 Jul 2018) $ + \filedate$Date: 2018-08-09 11:17:04 +0200 (Do, 09 Aug 2018) $ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} - \filerevision$Revision: 23 $ + \filerevision$Revision: 27 $ \endgroup \ProvidesFile{marginnote.dtx}[\filedate\space\filerevision\space % @@ -43,7 +52,7 @@ % \iffalse meta-comment %<*package|README> % \fi^^A meta-comment - 2018/07/01 v1.4a + 2018/08/09 v1.4b % \iffalse meta-comment % % \fi^^A meta-comment @@ -116,9 +125,10 @@ % % \GetFileInfo{marginnote.dtx} % -% \title{Non-Floating Margin Notes with \textsf{marginnote} -% Package\thanks{This file has revision number \fileversion, last revised -% \filedate.}} +% \title{Non-Floating Margin Notes with \textsf{marginnote}\thanks{URL: +% \texttt{https://komascript.de/marginnote}} Package\thanks{This file has +% revision number \fileversion, last revised \filedate. Please note: Currently +% this package is unmaintained. A new maintainer would be welcome!}} % \author{Markus Kohm\thanks{Email: \texttt{komascript@gmx.info}}} % \date{\packagedateandversion} % \maketitle @@ -161,13 +171,17 @@ % depth of the current line. Note, that this often results in vertical % misplacement but seldom in vertical extra space before or after the % current line. -% \item[\texttt{parboxrestore}] uses \cs{@parboxrestore} to restore the -% definition of \cs{par} and \cmd\\ and several other commands and sets -% \cs{parindent} and \cs{parskip} to 0, \cs{parfillskip} to 0\,pt plus -% 1\,fil and \cs{lineskip} to \cs{normallineskip} and \cs{baselineskip} to -% \cs{normalbaselineskip} for every margin note. This is the default since -% release 1.4 of \textsf{marginnote}. -% \item[\texttt{noparboxrestore}] does not use \cs{@parboxrestore}. +% \item[\texttt{parboxrestore}] uses a reduced \cs{@parboxrestore} to restore +% the definition of \cs{par} and \cmd\\ and several other commands and sets +% \cs{parindent} to 0, \cs{parfillskip} to 0\,pt plus 1\,fil and +% \cs{lineskip} to \cs{normallineskip}, \cs{baselineskip} to +% \cs{normalbaselineskip} and activates \cs{sloppy} for every margin +% note. This is the default since release 1.4b of +% \textsf{marginnote}. Release 1.4 and 1.4a also set \cs{parskip} to 0, but +% this resulted in a vertical placement issue, e.g., inside lists like +% \texttt{itemize}. +% \item[\texttt{noparboxrestore}] does not restore any definition for the +% margin notes. This was the behaviour before release 1.4. % \end{description} % % \DescribeMacro{\marginnote} @@ -230,6 +244,18 @@ % % \section{Known Issues Using \textsf{marginnote}} % +% Currently the package lacks of a new maintainer. The author does not longer +% maintain the package, because originally it was designed to be only a small +% hack to be used on some cases. But over the years it has grown and became a +% conglomerate of hacks that hack hacks that are used very widely. A break +% with a complete revise of the design would be necessary. But nothing I can +% or want to do currently. If you want to do it, please contact the author +% (see the footnotes on the first page). +% +% You can not use paragraphs with \cs{par} or empty lines inside a margin +% note. In my opinion this would note make sense. However, if you really need +% paragraphs you can try to use \cs{endgraf} instead of \cs{par}. +% % From version 1.4a there is a workaround for double-ended documents with % consecutive odd pages or consecutive even pages. However it is not % recommended to use double-ended documents with such page sequences, because @@ -474,7 +500,11 @@ % \begin{macrocode} \newcommand*{\mn@parboxrestore}{} \DeclareOption{parboxrestore}{% - \renewcommand*{\mn@parboxrestore}{\@parboxrestore}% + \renewcommand*{\mn@parboxrestore}{% + \@tempskipa\parskip + \@parboxrestore + \parskip\@tempskipa + }% } \DeclareOption{noparboxrestore}{% \renewcommand*{\mn@parboxrestore}{}% @@ -556,7 +586,7 @@ \stepcounter{mn@abspage}% % \end{macrocode} % \changes{v1.4a}{2018/07/21}{workaround for screwball page order}^^A -% From version 1.4a there is a workaround for conescutive odd pages or +% From version 1.4a there is a workaround for consecutive odd pages or % consecutive even pages in a twoside document. % \begin{macrocode} \ifodd\value{mn@abspage}% diff --git a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty index 5f99dccbff4..4ca7f8a546a 100644 --- a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty +++ b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty @@ -20,10 +20,10 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) -%%% From File: $Id: marginnote.dtx 23 2018-07-21 11:35:52Z mjk $ +%%% From File: $Id: marginnote.dtx 27 2018-08-09 09:17:04Z mjk $ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{marginnote}[% - 2018/07/01 v1.4a + 2018/08/09 v1.4b non floating margin notes for LaTeX] \begingroup \@ifundefined{pdfsavepos}{% @@ -133,7 +133,11 @@ } \newcommand*{\mn@parboxrestore}{} \DeclareOption{parboxrestore}{% - \renewcommand*{\mn@parboxrestore}{\@parboxrestore}% + \renewcommand*{\mn@parboxrestore}{% + \@tempskipa\parskip + \@parboxrestore + \parskip\@tempskipa + }% } \DeclareOption{noparboxrestore}{% \renewcommand*{\mn@parboxrestore}{}% -- cgit v1.2.3