diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/marginnote/README.txt | 18 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/marginnote/marginnote.pdf | bin | 288983 -> 294356 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/marginnote/README | 51 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/marginnote/marginnote.dtx | 182 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/marginnote/marginnote.ins | 63 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/marginnote/marginnote.sty | 69 |
6 files changed, 191 insertions, 192 deletions
diff --git a/Master/texmf-dist/doc/latex/marginnote/README.txt b/Master/texmf-dist/doc/latex/marginnote/README.txt new file mode 100644 index 00000000000..7af32fc9509 --- /dev/null +++ b/Master/texmf-dist/doc/latex/marginnote/README.txt @@ -0,0 +1,18 @@ +LaTeX package marginnote +Copyright (c) Markus Kohmm, 2005-2016 +------------------------------------------------------------------- +Version: + 2016/06/02 v1.2 +Licence: + This work may be distributed and/or modified under the conditions + of the LaTeX Project Public License, version 1.3c of the license. + The latest version of this license is in + http://www.latex-project.org/lppl.txt + and version 1.3c or later is part of all distributions of LaTeX + version 2005/12/01 or later and of this work. +Abstract: + This package provides the command \marginnote that may be used + instead of \marginpar at almost every place, where \marginpar + cannot be used, e.g. inside floats, footnotes, frames made with + framed package. See marginnote.pdf for more information. +------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf b/Master/texmf-dist/doc/latex/marginnote/marginnote.pdf Binary files differindex 4ae9cf65bd3..c4d248cd724 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/README b/Master/texmf-dist/source/latex/marginnote/README deleted file mode 100644 index 589d0223698..00000000000 --- a/Master/texmf-dist/source/latex/marginnote/README +++ /dev/null @@ -1,51 +0,0 @@ ----------------------------------------------------------------------------- -Package marginnote -Copyright (c) Markus Kohm 2005-2012 -Licence: LPPL -Version: 2012/03/29 v1.1i ----------------------------------------------------------------------------- -This package provides the command \marginnote that may be used instead of -\marginpar at almost every place, where \marginpar cannot be used, e.g. -inside floats, footnotes, frames made with framed package ... ----------------------------------------------------------------------------- -If you have a distribution of marginnote with an archive containing the -files - - doc/ - doc/latex/ - doc/latex/marginnote/ - doc/latex/marginnote/marginnote.pdf - source/ - source/latex/ - source/latex/marginnote/ - source/latex/marginnote/marginnote.dtx - source/latex/marginnote/marginnote.ins - source/latex/marginnote/README - tex/ - tex/latex/ - tex/latex/marginnote/ - tex/latex/marginnote/marginnote.sty - -you may simply extract this archive at your local texmf tree (local TDS tree) -that may be e.g. C:\localtexmf or /usr/local/share/texmf or -/usr/TeX/texmf-local. On some systems you may ask for the local TDS tree -using: `kpsewhich -var-value=TEXMFLOCAL'. After extraction you should update -your File Name DataBase e.g. using the MiKTeX Options dialog or texhash. - -If the files are at a root directory marginnote the distributor has changed my -original distribution archive and you have to copy the files yourself into -the appropriate directories at one of your texmf trees and update your File -Name DataBase. - -If you instead of this have only the files marginnote.dtx, marginnote.ins -marginnote.pdf (optional) and README, you have to call: - tex marginnote.ins -and follow the instructions. - -NOTE: README is part of the sources of the Work. To produce a legal and -valid distribution of the Work, you need only the source files -`marginnote.dtx', `marginnote.ins', and `README'. You are not allowed to -distribute any of these without the others. You are not allowed to -distribute the generated files `marginnote.sty' or `marginnote.pdf' without -these source files. See LPPL for definition of `distribution'! ----------------------------------------------------------------------------- diff --git a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx index 28ce99da42d..ee99d70276a 100644 --- a/Master/texmf-dist/source/latex/marginnote/marginnote.dtx +++ b/Master/texmf-dist/source/latex/marginnote/marginnote.dtx @@ -1,57 +1,126 @@ -% \CheckSum{765} +% \CheckSum{810} % \iffalse meta-comment -% +% ====================================================================== % marginnote.dtx +% Copyright (c) Markus Kohm, 2005-2016 +% +% This file is part of the work marginnote. +% +% This work may be distributed and/or modified under the conditions of +% the LaTeX Project Public License, version 1.3c of the license. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% 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. % -%% Copyright (c) Markus Kohm 2005-2012 -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% The author of the initial version of these work was -%% Markus Kohm <komascript@gmx.info> -%% -%% This work consists of the files marginnote.dtx, marginnote.ins, -%% and REAMDE. -%% -%% Important Recommendation: -%% The LPPL requires that distributions of the Work contain all the files of -%% the Work (see ``Important Recommendations'' at lppl.txt). -%% -% -%<*driver> -\ProvidesFile{marginnote.dtx}[% -%</driver> +% This work consists of the files marginnote.dtx and the +% derived files README.txt and marginnote.sty. +% ====================================================================== +% +%<package>%%% From File: $Id: marginnote.dtx 5 2016-06-02 09:05:56Z 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-06-02 11:05:56 +0200 (Do, 02. Jun 2016) $ + \def\filerevision$#1: #2 ${\gdef\filerevision{#2}} + \filerevision$Revision: 5 $ +\endgroup +\ProvidesFile{marginnote.dtx}[\filedate\space\filerevision\space +%</dtx> +%<package>\NeedsTeXFormat{LaTeX2e}[1995/12/01] %<package>\ProvidesPackage{marginnote}[% -%<*driver|package> - 2012/03/29 v1.1i non floating margin notes for LaTeX] -%</driver|package> -%<*driver> +%<README>LaTeX package marginnote +%<README>Copyright (c) Markus Kohmm, 2005-2016 +%<README>------------------------------------------------------------------- +%<README>Version: +% \fi^^A meta-comment +% \newcommand*{\packagedateandversion}{% +% \iffalse meta-comment +%<*package|README> +% \fi^^A meta-comment + 2016/06/02 v1.2 +% \iffalse meta-comment +%</package|README> +% \fi^^A meta-comment +% } +% \iffalse meta-comment +%<README>Licence: +%<README> This work may be distributed and/or modified under the conditions +%<README> of the LaTeX Project Public License, version 1.3c of the license. +%<README> The latest version of this license is in +%<README> http://www.latex-project.org/lppl.txt +%<README> and version 1.3c or later is part of all distributions of LaTeX +%<README> version 2005/12/01 or later and of this work. +%<README>Abstract: +%<README> This package provides the command \marginnote that may be used +%<README> instead of \marginpar at almost every place, where \marginpar +%<README> cannot be used, e.g. inside floats, footnotes, frames made with +%<README> framed package. See marginnote.pdf for more information. +%<README>------------------------------------------------------------------- +%<*dtx|package> + non floating margin notes for LaTeX] +%</dtx|package> +%<*dtx> +\ifx\documentclass\undefined + \input docstrip.tex + + \keepsilent + \askforoverwritefalse + \usedir{tex/latex/marginnote} + + \generate{% + \file{marginnote.sty}{\from{marginnote.dtx}{package}}% + \nopreamble\nopostamble + \file{README.txt}{\from{marginnote.dtx}{README}}% + } + + \ifToplevel{% + \Msg{*********************************************************************} + \Msg{*} + \Msg{* marginnote} + \Msg{* ==========} + \Msg{*} + \Msg{* To finish the installation run} + \Msg{* \space\space pdflatex marginnote.dtx} + \Msg{* After this copy} + \Msg{* \space\space marginnote.sty to .../tex/latex/marginnote/} + \Msg{* \space\space marginnote.pdf to .../doc/latex/marginnote/} + \Msg{* \space\space marginnote.dtx to .../source/latex/marginnote/} + \Msg{* \space\space README + \space\space\space\space\space\space\space\space to + .../source/latex/marginnote/} + \Msg{* where .../ is your local TDS tree} + \Msg{*} + \Msg{*********************************************************************} + } +\else + \let\endbatchfile\relax +\fi +\endbatchfile \documentclass{ltxdoc} \usepackage{graphicx}% needed for \reflectbox \providecommand*{\XeTeX}{% X\kern-.1em\lower.5ex\hbox{\reflectbox{E}}\kern-.15em\TeX} -\begin{document} +\CodelineIndex \RecordChanges +\begin{document} \DocInput{marginnote.dtx} \end{document} -%</driver> +%</dtx> %\fi % % \GetFileInfo{marginnote.dtx} % % \title{Non-Floating Margin Notes with \textsf{marginnote} -% Package\thanks{This file has version number \fileversion, last revised +% Package\thanks{This file has revision number \fileversion, last revised % \filedate.}} % \author{Markus Kohm\thanks{Email: \texttt{komascript@gmx.info}}} -% \date{\filedate} +% \date{\packagedateandversion} % \maketitle % % \begin{abstract} @@ -365,12 +434,15 @@ % \end{macro} % % \begin{macro}{\if@mn@pdfmode} -% \changes{v1.1}{2006/10/23}{new switch}% +% \changes{v1.1}{2006/10/23}{new switch}^^A % \changes{v1.1a}{2008/11/10}{PDF\TeX\ since 1.40 allows \cs{pdfsavepos} in -% DVI mode too}% -% \changes{v1.1b}{2009/02/16}{if level fixed}% -% \changes{v1.1c}{2009/02/26}{\protect\XeTeX has working \cs{pdflastxpos} -% but no \cs{pdftexversion}}% +% DVI mode too}^^A +% \changes{v1.1b}{2009/02/16}{if level fixed}^^A +% \changes{v1.1c}{2009/02/26}{\protect\XeTeX has working \cs{pdflastxpos}^^A +% but no \cs{pdftexversion}}^^A +% \changes{v1.2}{2016/06/02}{addition for lua\TeX{} from 0.85}^^A +% \begin{macro}{\@mn@mode@prefix} +% \changes{v1.2}{2016/06/02}{(new (internal)}^^A % We need to know, wether or not PDF\TeX{} and which version of PDF\TeX{} is % used. With PDF\TeX{} the horizontal output position may be detected using % \cs{pdfsavepos} and \cs{pdflastxpos}. So the relative position of the margin @@ -379,9 +451,16 @@ % setting up the switch is delayed. % \begin{macrocode} \newif\if@mn@pdfmode\@mn@pdfmodefalse +\newcommand*{\@mn@mode@prefix}{pdf} \AtBeginDocument{% \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdflastxpos\endcsname\relax\else % bg or 1 + \expandafter\ifx\csname pdflastxpos\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname lastxpos\endcsname\relax\else + \@mn@pdfmodetrue + \renewcommand*{\@mn@mode@prefix}{}% + \fi + \else % bg or 1 \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdftexversion\endcsname\relax % bg 2 \begingroup\expandafter\expandafter\expandafter\endgroup @@ -408,7 +487,8 @@ \if@mn@verbose \if@mn@pdfmode \PackageInfo{marginnote}{% - \string\pdfoutput\space not 0 and \string\pdflastxpos\space + \string\pdfoutput\space not 0 or unimportant and\MessageBreak + \string\pdflastxpos\space or \string\lastxpos\space available.\MessageBreak Extended position detection mode activated\@gobble }% @@ -424,6 +504,7 @@ } % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\marginnotetextwidth} % \changes{v1.1}{2006/10/23}{new macro} @@ -469,6 +550,7 @@ \g@addto@macro\@outputpage{\stepcounter{mn@abspage}}} \newcommand*{\@mn@margintest}{% % \end{macrocode} +% \changes{v1.2}{2016/06/02}{addition for lua\TeX{} from 0.85}^^A % Number of the next margin note at this page. % \begin{macrocode} \expandafter\ifx\csname @mn@thispage\endcsname\@empty @@ -491,10 +573,10 @@ \let\@mn@currpage\relax \let\@mn@currxpos\relax \if@mn@pdfmode - \pdfsavepos + \@nameuse{\@mn@mode@prefix savepos}% \protected@write\@auxout{\let\themn@abspage\relax}{% \string\newmarginnote{note.\@mn@thispage.\@mn@atthispage}{% - {\themn@abspage}{\noexpand\number\pdflastxpos sp}}% + {\themn@abspage}{\noexpand\number\@nameuse{\@mn@mode@prefix lastxpos}sp}}% }% \else \protected@write\@auxout{\let\themn@abspage\relax}{% @@ -540,7 +622,15 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfhorigin\endcsname\relax\else \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdfoutput\endcsname\relax\else + \expandafter\ifx\csname pdfoutput\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname outputmode\endcsname\relax\else + \ifnum \outputmode=1 % + \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin + +1in\relax}% + \fi + \fi + \else \ifnum \pdfoutput=1 % \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin +1in\relax}% diff --git a/Master/texmf-dist/source/latex/marginnote/marginnote.ins b/Master/texmf-dist/source/latex/marginnote/marginnote.ins deleted file mode 100644 index f81ff40b438..00000000000 --- a/Master/texmf-dist/source/latex/marginnote/marginnote.ins +++ /dev/null @@ -1,63 +0,0 @@ -% -% marginnote.ins -% -%% Copyright (c) Markus Kohm 2005-2012 -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% The author of the initial version of these work was -%% Markus Kohm <komascript@gmx.info> -%% -%% This work consists of the files marginnote.dtx, marginnote.ins, -%% and REAMDE. -%% - -\def\batchfile{marginnote.ins} -\input docstrip.tex - -\keepsilent -\askforoverwritefalse -\usedir{tex/latex/marginnote} - -\preamble - -IMPORTANT NOTE: - -This is a generated file and you are not allowed to distribute it -without the source ot the work. See below about more informations -about the files the work consists of. - -\endpreamble - -\generate{\file{marginnote.sty}{\from{marginnote.dtx}{package}}} - -\ifToplevel{% - \Msg{*********************************************************************} - \Msg{*} - \Msg{* marginnote} - \Msg{* ==========} - \Msg{*} - \Msg{* To finish the installation run} - \Msg{* \space\space latex marginnote.dtx} - \Msg{* After this copy} - \Msg{* \space\space marginnote.sty to .../tex/latex/marginnote/} - \Msg{* \space\space marginnote.dvi to .../doc/latex/marginnote/} - \Msg{* \space\space marginnote.dtx to .../source/latex/marginnote/} - \Msg{* \space\space marginnote.ins to .../source/latex/marginnote/} - \Msg{* \space\space README - \space\space\space\space\space\space\space\space to - .../source/latex/marginnote/} - \Msg{* where .../ is your local TDS tree} - \Msg{*} - \Msg{*********************************************************************} -} - -\endinput diff --git a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty index 1f13ac1d3cf..2ea2b24b315 100644 --- a/Master/texmf-dist/tex/latex/marginnote/marginnote.sty +++ b/Master/texmf-dist/tex/latex/marginnote/marginnote.sty @@ -6,36 +6,25 @@ %% %% marginnote.dtx (with options: `package') %% -%% IMPORTANT NOTE: +%% IMPORTANT NOTICE: %% -%% This is a generated file and you are not allowed to distribute it -%% without the source ot the work. See below about more informations -%% about the files the work consists of. +%% For the copyright see the source file. %% -%% Copyright (c) Markus Kohm 2005-2012 -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2003/12/01 or later. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% The author of the initial version of these work was -%% Markus Kohm <komascript@gmx.info> -%% -%% This work consists of the files marginnote.dtx, marginnote.ins, -%% and REAMDE. -%% -%% Important Recommendation: -%% The LPPL requires that distributions of the Work contain all the files of -%% the Work (see ``Important Recommendations'' at lppl.txt). -%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from marginnote.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file marginnote.dtx. +%% +%% This generated file may be distributed as long as the +%% 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 5 2016-06-02 09:05:56Z mjk $ +\NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{marginnote}[% - 2012/03/29 v1.1i non floating margin notes for LaTeX] + 2016/06/02 v1.2 + non floating margin notes for LaTeX] \begingroup \def\@tempb{}% \def\@tempa{% @@ -117,9 +106,16 @@ \ProcessOptions\relax \newcommand*{\newmarginnote}{\@newl@bel{mn}} \newif\if@mn@pdfmode\@mn@pdfmodefalse +\newcommand*{\@mn@mode@prefix}{pdf} \AtBeginDocument{% \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdflastxpos\endcsname\relax\else % bg or 1 + \expandafter\ifx\csname pdflastxpos\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname lastxpos\endcsname\relax\else + \@mn@pdfmodetrue + \renewcommand*{\@mn@mode@prefix}{}% + \fi + \else % bg or 1 \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdftexversion\endcsname\relax % bg 2 \begingroup\expandafter\expandafter\expandafter\endgroup @@ -146,7 +142,8 @@ \if@mn@verbose \if@mn@pdfmode \PackageInfo{marginnote}{% - \string\pdfoutput\space not 0 and \string\pdflastxpos\space + \string\pdfoutput\space not 0 or unimportant and\MessageBreak + \string\pdflastxpos\space or \string\lastxpos\space available.\MessageBreak Extended position detection mode activated\@gobble }% @@ -185,10 +182,10 @@ \let\@mn@currpage\relax \let\@mn@currxpos\relax \if@mn@pdfmode - \pdfsavepos + \@nameuse{\@mn@mode@prefix savepos}% \protected@write\@auxout{\let\themn@abspage\relax}{% \string\newmarginnote{note.\@mn@thispage.\@mn@atthispage}{% - {\themn@abspage}{\noexpand\number\pdflastxpos sp}}% + {\themn@abspage}{\noexpand\number\@nameuse{\@mn@mode@prefix lastxpos}sp}}% }% \else \protected@write\@auxout{\let\themn@abspage\relax}{% @@ -219,7 +216,15 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfhorigin\endcsname\relax\else \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdfoutput\endcsname\relax\else + \expandafter\ifx\csname pdfoutput\endcsname\relax + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname outputmode\endcsname\relax\else + \ifnum \outputmode=1 % + \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin + +1in\relax}% + \fi + \fi + \else \ifnum \pdfoutput=1 % \edef\@mn@currxpos{\the\dimexpr \@mn@currxpos -\pdfhorigin +1in\relax}% |