diff options
author | Karl Berry <karl@freefriends.org> | 2018-07-21 20:19:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-07-21 20:19:53 +0000 |
commit | bdf3fec95c9a276976158d3f5edfb4f22c278105 (patch) | |
tree | eb9b4c0f55d390d166570b4a1c5f64c90c0aef10 /Master/texmf-dist | |
parent | 1a1e93f3750fe1754389dcb837bb345276138bd5 (diff) |
marginnote (21jul18)
git-svn-id: svn://tug.org/texlive/trunk@48244 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/marginnote/README.txt | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/marginnote/marginnote.pdf | bin | 311063 -> 313336 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/marginnote/marginnote.dtx | 74 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/marginnote/marginnote.sty | 57 |
4 files changed, 123 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/marginnote/README.txt b/Master/texmf-dist/doc/latex/marginnote/README.txt index 4c538658f76..188a76367ac 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.4 + 2018/07/01 v1.4a 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 Binary files differindex 56aac6eaa1d..485994fe07d 100644 --- a/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf +++ b/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf diff --git a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx index 84d821d8e12..c3b9c606dde 100644 --- a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx +++ b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx @@ -1,4 +1,4 @@ -% \CheckSum{728} +% \CheckSum{783} % \iffalse meta-comment % ====================================================================== % marginnote.dtx @@ -21,14 +21,14 @@ % derived files README.txt and marginnote.sty. % ====================================================================== % -%<package>%%% From File: $Id: marginnote.dtx 21 2018-04-20 06:19:32Z mjk $ +%<package>%%% From File: $Id: marginnote.dtx 23 2018-07-21 11:35:52Z 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-04-20 08:19:32 +0200 (Fr, 20 Apr 2018) $ + \filedate$Date: 2018-07-21 13:35:52 +0200 (Sa, 21 Jul 2018) $ \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} - \filerevision$Revision: 21 $ + \filerevision$Revision: 23 $ \endgroup \ProvidesFile{marginnote.dtx}[\filedate\space\filerevision\space %</dtx> @@ -43,7 +43,7 @@ % \iffalse meta-comment %<*package|README> % \fi^^A meta-comment - 2018/07/01 v1.4 + 2018/07/01 v1.4a % \iffalse meta-comment %</package|README> % \fi^^A meta-comment @@ -230,6 +230,12 @@ % % \section{Known Issues Using \textsf{marginnote}} % +% 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 +% printing such documents could be a mess. \texttt{marginnote} shows a warning +% message whenever it detects those page sequences. +% % From version 1.3 \texttt{marginnote} does not longer support \TeX{} engines % without primitives \cs{pdfsavepos}/\cs{savepos} and % \cs{pdflastxpos}/\cs{lastxpos}. The former (manual adjustment) fallback has @@ -546,7 +552,63 @@ \newcommand*{\@mn@currxpos}{} \newcounter{mn@abspage} \AtBeginDocument{\setcounter{mn@abspage}{1}% - \g@addto@macro\@outputpage{\stepcounter{mn@abspage}}} + \g@addto@macro\@outputpage{% + \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 +% consecutive even pages in a twoside document. +% \begin{macrocode} + \ifodd\value{mn@abspage}% + \ifodd\value{page}% + \else + \if@twoside + \begingroup + \advance\c@page\m@ne + \PackageWarningNoLine{marginnote}{% + Consecutive odd pages found.\MessageBreak + Note, it is not recommended to use consecutive\MessageBreak + odd pages in a double-ended document.\MessageBreak + The pages of your document should always\MessageBreak + be a sequence: odd-even-odd-even-...\MessageBreak + Maybe you've forgotten a + \@ifundefined{KOMAClassName}% + {\string\cleardoublepage}% + {\string\cleardoubleoddpage} + before\MessageBreak + changing the page numbering on page \thepage + }% + \endgroup + \fi + \PackageInfo{marginnote}{Using workaround for absolute page number}% + \stepcounter{mn@abspage}% + \fi + \else + \ifodd\value{page}% + \if@twoside + \begingroup + \advance\c@page\m@ne + \PackageWarningNoLine{marginnote}{% + Consecutive even pages found.\MessageBreak + Note, it is not recommended to use consecutive\MessageBreak + even pages in a double-ended document.\MessageBreak + The pages of your document should always\MessageBreak + be a sequence: odd-even-odd-even-...\MessageBreak + Maybe you've forgotten a + \@ifundefined{KOMAClassName}% + {\string\cleardoublepage}% + {\string\cleardoubleevenpage} + before\MessageBreak + changing the page numbering on page \thepage + }% + \endgroup + \fi + \PackageInfo{marginnote}{Using workaround for absolute page number}% + \stepcounter{mn@abspage}% + \fi + \fi + }% +} \newcommand*{\@mn@margintest}{% % \end{macrocode} % \changes{v1.2}{2016/06/02}{addition for lua\TeX{} from 0.85}^^A diff --git a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty index cfba8345878..5f99dccbff4 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 21 2018-04-20 06:19:32Z mjk $ +%%% From File: $Id: marginnote.dtx 23 2018-07-21 11:35:52Z mjk $ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{marginnote}[% - 2018/07/01 v1.4 + 2018/07/01 v1.4a non floating margin notes for LaTeX] \begingroup \@ifundefined{pdfsavepos}{% @@ -149,7 +149,58 @@ \newcommand*{\@mn@currxpos}{} \newcounter{mn@abspage} \AtBeginDocument{\setcounter{mn@abspage}{1}% - \g@addto@macro\@outputpage{\stepcounter{mn@abspage}}} + \g@addto@macro\@outputpage{% + \stepcounter{mn@abspage}% + \ifodd\value{mn@abspage}% + \ifodd\value{page}% + \else + \if@twoside + \begingroup + \advance\c@page\m@ne + \PackageWarningNoLine{marginnote}{% + Consecutive odd pages found.\MessageBreak + Note, it is not recommended to use consecutive\MessageBreak + odd pages in a double-ended document.\MessageBreak + The pages of your document should always\MessageBreak + be a sequence: odd-even-odd-even-...\MessageBreak + Maybe you've forgotten a + \@ifundefined{KOMAClassName}% + {\string\cleardoublepage}% + {\string\cleardoubleoddpage} + before\MessageBreak + changing the page numbering on page \thepage + }% + \endgroup + \fi + \PackageInfo{marginnote}{Using workaround for absolute page number}% + \stepcounter{mn@abspage}% + \fi + \else + \ifodd\value{page}% + \if@twoside + \begingroup + \advance\c@page\m@ne + \PackageWarningNoLine{marginnote}{% + Consecutive even pages found.\MessageBreak + Note, it is not recommended to use consecutive\MessageBreak + even pages in a double-ended document.\MessageBreak + The pages of your document should always\MessageBreak + be a sequence: odd-even-odd-even-...\MessageBreak + Maybe you've forgotten a + \@ifundefined{KOMAClassName}% + {\string\cleardoublepage}% + {\string\cleardoubleevenpage} + before\MessageBreak + changing the page numbering on page \thepage + }% + \endgroup + \fi + \PackageInfo{marginnote}{Using workaround for absolute page number}% + \stepcounter{mn@abspage}% + \fi + \fi + }% +} \newcommand*{\@mn@margintest}{% \expandafter\ifx\csname @mn@thispage\endcsname\@empty \gdef\@mn@atthispage{1}% |