texlive[43979] Master/texmf-dist: marginnote (22apr17)
commits+karl at tug.org
commits+karl at tug.org
Sat Apr 22 23:22:18 CEST 2017
Revision: 43979
http://tug.org/svn/texlive?view=revision&revision=43979
Author: karl
Date: 2017-04-22 23:22:17 +0200 (Sat, 22 Apr 2017)
Log Message:
-----------
marginnote (22apr17)
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
Modified: trunk/Master/texmf-dist/doc/latex/marginnote/README.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/marginnote/README.txt 2017-04-22 21:22:02 UTC (rev 43978)
+++ trunk/Master/texmf-dist/doc/latex/marginnote/README.txt 2017-04-22 21:22:17 UTC (rev 43979)
@@ -1,8 +1,8 @@
LaTeX package marginnote
-Copyright (c) Markus Kohmm, 2005-2016
+Copyright (c) Markus Kohm, 2005-2017
-------------------------------------------------------------------
Version:
- 2016/10/21 v1.2a
+ 2017/04/22 v1.2b
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 2017-04-22 21:22:02 UTC (rev 43978)
+++ trunk/Master/texmf-dist/source/latex/marginnote/marginnote.dtx 2017-04-22 21:22:17 UTC (rev 43979)
@@ -1,8 +1,8 @@
-% \CheckSum{815}
+% \CheckSum{859}
% \iffalse meta-comment
% ======================================================================
% marginnote.dtx
-% Copyright (c) Markus Kohm, 2005-2016
+% Copyright (c) Markus Kohm, 2005-2017
%
% This file is part of the work marginnote.
%
@@ -21,14 +21,14 @@
% derived files README.txt and marginnote.sty.
% ======================================================================
%
-%<package>%%% From File: $Id: marginnote.dtx 9 2016-10-21 06:45:27Z mjk $
+%<package>%%% From File: $Id: marginnote.dtx 13 2017-04-22 09:25:22Z 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: 2016-10-21 08:45:27 +0200 (Fr, 21 Okt 2016) $
+ \filedate$Date: 2017-04-22 11:25:22 +0200 (Sa, 22 Apr 2017) $
\def\filerevision$#1: #2 ${\gdef\filerevision{#2}}
- \filerevision$Revision: 9 $
+ \filerevision$Revision: 13 $
\endgroup
\ProvidesFile{marginnote.dtx}[\filedate\space\filerevision\space
%</dtx>
@@ -35,7 +35,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1995/12/01]
%<package>\ProvidesPackage{marginnote}[%
%<README>LaTeX package marginnote
-%<README>Copyright (c) Markus Kohmm, 2005-2016
+%<README>Copyright (c) Markus Kohm, 2005-2017
%<README>-------------------------------------------------------------------
%<README>Version:
% \fi^^A meta-comment
@@ -43,7 +43,7 @@
% \iffalse meta-comment
%<*package|README>
% \fi^^A meta-comment
- 2016/10/21 v1.2a
+ 2017/04/22 v1.2b
% \iffalse meta-comment
%</package|README>
% \fi^^A meta-comment
@@ -641,6 +641,24 @@
\fi
\fi
\fi
+% \end{macrocode}
+% \changes{v1.2b}{2017/04/22}{\textsf{bidi} code added}^^A
+% If you are using package \textsf{bidi} and RTL mode is active, the position
+% is from right instead of left. So we have to substract \cs{@mn at currxpos}
+% from \cs{pdfpagewidth} (or \cs{pagewidth} using Lua\TeX, but this cannot be,
+% because \textsf{bidi} is not Lua\TeX-compatible).
+% \begin{macrocode}
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname \@mn at mode@prefix pagewidth\endcsname\relax\else
+ \@mn at if@RTL{%
+ \PackageInfo{marginnote}{Margin note
+ \@mn at thispage.\@mn at atthispage\space in RTL mode}%
+ \edef\@mn at currxpos{%
+ \the\dimexpr\@nameuse{\@mn at mode@prefix pagewidth}
+ -\@mn at currxpos\relax
+ }%
+ }{}%
+ \fi
\fi
\edef\@mn at currpage{\expandafter\@firstoftwo\@mn at currpage}%
\if at mn@verbose
@@ -662,6 +680,19 @@
\fi
}
% \end{macrocode}
+% \begin{macro}{@mn at ifRTL}
+% \changes{1.2b}{2017/04/22}{new internal}
+% Test, whether or not \cs{if at RTL} exists and is true or false.
+% \begin{macrocode}
+\newcommand*{\@mn at if@RTL}{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname if at RTL\endcsname\iftrue
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
+% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
@@ -668,6 +699,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\marginnote}
% \begin{macro}{\@mn at marginnote}
Modified: trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty 2017-04-22 21:22:02 UTC (rev 43978)
+++ trunk/Master/texmf-dist/tex/latex/marginnote/marginnote.sty 2017-04-22 21:22:17 UTC (rev 43979)
@@ -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 9 2016-10-21 06:45:27Z mjk $
+%%% From File: $Id: marginnote.dtx 13 2017-04-22 09:25:22Z mjk $
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{marginnote}[%
- 2016/10/21 v1.2a
+ 2017/04/22 v1.2b
non floating margin notes for LaTeX]
\begingroup
\def\@tempb{}%
@@ -232,6 +232,17 @@
\fi
\fi
\fi
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname \@mn at mode@prefix pagewidth\endcsname\relax\else
+ \@mn at if@RTL{%
+ \PackageInfo{marginnote}{Margin note
+ \@mn at thispage.\@mn at atthispage\space in RTL mode}%
+ \edef\@mn at currxpos{%
+ \the\dimexpr\@nameuse{\@mn at mode@prefix pagewidth}
+ -\@mn at currxpos\relax
+ }%
+ }{}%
+ \fi
\fi
\edef\@mn at currpage{\expandafter\@firstoftwo\@mn at currpage}%
\if at mn@verbose
@@ -252,6 +263,14 @@
\fi
\fi
}
+\newcommand*{\@mn at if@RTL}{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname if at RTL\endcsname\iftrue
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
\newcommand*{\marginnote}{%
\@dblarg\@mn at marginnote
}
More information about the tex-live-commits
mailing list