texlive[48244] Master: marginnote (21jul18)

commits+karl at tug.org commits+karl at tug.org
Sat Jul 21 22:19:53 CEST 2018


Revision: 48244
          http://tug.org/svn/texlive?view=revision&revision=48244
Author:   karl
Date:     2018-07-21 22:19:53 +0200 (Sat, 21 Jul 2018)
Log Message:
-----------
marginnote (21jul18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/marginnote/README.txt
    trunk/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf
    trunk/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
    trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
    trunk/Master/tlpkg/bin/tlpkg-ctan-check

Modified: trunk/Master/texmf-dist/doc/latex/marginnote/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/marginnote/README.txt	2018-07-21 20:18:51 UTC (rev 48243)
+++ trunk/Master/texmf-dist/doc/latex/marginnote/README.txt	2018-07-21 20:19:53 UTC (rev 48244)
@@ -2,7 +2,7 @@
 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.

Modified: trunk/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/marginnote/marginnote.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/marginnote/marginnote.dtx	2018-07-21 20:18:51 UTC (rev 48243)
+++ trunk/Master/texmf-dist/source/latex/marginnote/marginnote.dtx	2018-07-21 20:19:53 UTC (rev 48244)
@@ -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 at currxpos}{}
 \newcounter{mn at abspage}
 \AtBeginDocument{\setcounter{mn at abspage}{1}%
-  \g at addto@macro\@outputpage{\stepcounter{mn at abspage}}}
+  \g at addto@macro\@outputpage{%
+    \stepcounter{mn at 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 at abspage}%
+      \ifodd\value{page}%
+      \else
+        \if at twoside
+          \begingroup
+            \advance\c at page\m at 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 at abspage}%
+      \fi
+    \else
+      \ifodd\value{page}%
+        \if at twoside
+          \begingroup
+            \advance\c at page\m at 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 at abspage}%
+      \fi
+    \fi   
+  }%
+}
 \newcommand*{\@mn at margintest}{%
 %    \end{macrocode}
 % \changes{v1.2}{2016/06/02}{addition for lua\TeX{} from 0.85}^^A

Modified: trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty	2018-07-21 20:18:51 UTC (rev 48243)
+++ trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty	2018-07-21 20:19:53 UTC (rev 48244)
@@ -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 at currxpos}{}
 \newcounter{mn at abspage}
 \AtBeginDocument{\setcounter{mn at abspage}{1}%
-  \g at addto@macro\@outputpage{\stepcounter{mn at abspage}}}
+  \g at addto@macro\@outputpage{%
+    \stepcounter{mn at abspage}%
+    \ifodd\value{mn at abspage}%
+      \ifodd\value{page}%
+      \else
+        \if at twoside
+          \begingroup
+            \advance\c at page\m at 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 at abspage}%
+      \fi
+    \else
+      \ifodd\value{page}%
+        \if at twoside
+          \begingroup
+            \advance\c at page\m at 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 at abspage}%
+      \fi
+    \fi
+  }%
+}
 \newcommand*{\@mn at margintest}{%
   \expandafter\ifx\csname @mn at thispage\endcsname\@empty
     \gdef\@mn at atthispage{1}%

Modified: trunk/Master/tlpkg/bin/tlpkg-ctan-check
===================================================================
--- trunk/Master/tlpkg/bin/tlpkg-ctan-check	2018-07-21 20:18:51 UTC (rev 48243)
+++ trunk/Master/tlpkg/bin/tlpkg-ctan-check	2018-07-21 20:19:53 UTC (rev 48244)
@@ -489,7 +489,8 @@
     pdf14
     pdf-trans pdfbook2 pdfcomment pdfcprot pdfcrop pdfjam
     pdflatexpicscale pdfmarginpar pdfoverlay
-    pdfpagediff pdfpages pdfprivacy pdfreview pdfscreen pdfslide pdfsync
+    pdfpagediff pdfpages pdfpc-movie pdfprivacy pdfreview
+    pdfscreen pdfslide pdfsync
     pdftricks pdftricks2 pdfx pdfxup
     pecha pedigree-perl penrose perception perfectcut perltex
     permute persian-bib



More information about the tex-live-commits mailing list