summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-11-05 23:11:10 +0000
committerKarl Berry <karl@freefriends.org>2014-11-05 23:11:10 +0000
commit00025138cae4c9da826a4ff4982dc2c9aed2c28e (patch)
treecdc2ef19c4e47994ea379b0aca0767c6db9ea144
parent614e92fcfb7bbf20b314eafeac08856e5b337f05 (diff)
mnotes (5nov14)
git-svn-id: svn://tug.org/texlive/trunk@35521 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/mnotes/Makefile2
-rw-r--r--Master/texmf-dist/doc/latex/mnotes/mnotes.pdfbin207506 -> 210491 bytes
-rw-r--r--Master/texmf-dist/source/latex/mnotes/mnotes.dtx43
-rw-r--r--Master/texmf-dist/source/latex/mnotes/mnotes.ins2
-rw-r--r--Master/texmf-dist/tex/latex/mnotes/mnotes.sty28
5 files changed, 46 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/latex/mnotes/Makefile b/Master/texmf-dist/doc/latex/mnotes/Makefile
index 0fb9568c543..e9d5e727a8b 100644
--- a/Master/texmf-dist/doc/latex/mnotes/Makefile
+++ b/Master/texmf-dist/doc/latex/mnotes/Makefile
@@ -1,6 +1,6 @@
SHELL=/bin/bash
NAME=mnotes
-VERSION=0.6
+VERSION=0.8
DISTDIR=$(NAME)
ARCHIVE_NAME=/tmp/$(NAME)-$(VERSION).tar.gz
DISTFILES=$(NAME).dtx Makefile README $(NAME).ins $(NAME).pdf
diff --git a/Master/texmf-dist/doc/latex/mnotes/mnotes.pdf b/Master/texmf-dist/doc/latex/mnotes/mnotes.pdf
index c69f0af2942..c5aab4221ed 100644
--- a/Master/texmf-dist/doc/latex/mnotes/mnotes.pdf
+++ b/Master/texmf-dist/doc/latex/mnotes/mnotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/mnotes/mnotes.dtx b/Master/texmf-dist/source/latex/mnotes/mnotes.dtx
index 821298a1f4c..babd0566a6c 100644
--- a/Master/texmf-dist/source/latex/mnotes/mnotes.dtx
+++ b/Master/texmf-dist/source/latex/mnotes/mnotes.dtx
@@ -93,7 +93,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
%</driver>
%<package>\ProvidesPackage{mnotes}[%
%<*driver|package>
- 2013/20/04 v0.6 margin notes for collaborative document editing]
+ 2013/20/04 v0.7 margin notes for collaborative document editing]
%</driver|package>
%<*driver>
\documentclass{ltxdoc}
@@ -183,8 +183,11 @@ and version 1.3 or later is part of all distributions of LaTeX version
% the comments from the \LaTeX\ code.
%
% \changes{v0.6}{2013/04/22}{Added nosidenotes option}
+% \changes{v0.8}{2014/11/05}{By default don't use sidenotes. Specify
+% sidenotes option to use it. marginnote allows placement of MNOTEs on
+% floats; sidenote doesn't seem to.}
%
-% \item[\texttt{nosidenotes}] don't use sidenotes.
+% \item[\texttt{sidenotes}] use sidenote package instead of plain marginnote.
% \item[\texttt{basic}] This causes the note setting to fallback to
% \LaTeX{} kernel's \verb+\marginpar+, in case \texttt{sidenotes} or
% \texttt{tikz} isn't available.
@@ -276,17 +279,17 @@ and version 1.3 or later is part of all distributions of LaTeX version
\newif\if@mnotes@basic
\@mnotes@basicfalse
\newif\if@mnotes@sidenotes
-\@mnotes@sidenotestrue
+\@mnotes@sidenotesfalse
\newif\if@mnotes@scale
\@mnotes@scalefalse
\newif\if@mnotes@reverseconnect
\@mnotes@reverseconnectfalse
-%
+% \end{macrocode}
% Get package options
-%
+% \begin{macrocode}
\RequirePackage{kvoptions}
\DeclareVoidOption{basic}{\@mnotes@basictrue}
-\DeclareVoidOption{nosidenotes}{\@mnotes@sidenotesfalse}
+\DeclareVoidOption{sidenotes}{\@mnotes@sidenotestrue}
\DeclareVoidOption{hide}{\@mnotes@hidetrue \AtEndOfPackage{\HideMNOTES{}}}
\DeclareVoidOption{reverseconnect}{\@mnotes@reverseconnecttrue}
\SetupKeyvalOptions{family=mnotes, prefix=mnotes@}
@@ -307,17 +310,25 @@ and version 1.3 or later is part of all distributions of LaTeX version
%\ExecuteOptions{}
\ProcessKeyvalOptions{mnotes}
%\ProcessOptions
+% \end{macrocode}
+% \changes{v0.7}{2013/04/24}{made basic option independent of
+% ifoddpage package}
+% \begin{macrocode}
\if@twocolumn\if@mnotes@scale\hoffset\pdfpagewidth
\advance\hoffset-\paperwidth
- \hoffset.5\hoffset\fi
-\RequirePackage{ifoddpage}
+ \hoffset.5\hoffset\fi\fi
\if@mnotes@basic
-\RequirePackage{color}
-\else
-\if@mnotes@sidenotes
- \RequirePackage{sidenotes}
-\fi
-\RequirePackage{tikz}
+ \RequirePackage{color}
+ \newif\ifoddpage %% define \ifoddpage even though it's not used to
+\else %% avoid extra bracket error
+ \if@mnotes@sidenotes
+ \RequirePackage{sidenotes}
+ \else
+ \RequirePackage{marginnote}
+ \renewcommand\marginpar\marginnote
+ \fi
+ \RequirePackage{tikz}
+ \RequirePackage{ifoddpage}
\fi
% \end{macrocode}
% \begin{macro}{\MNOTEon}
@@ -331,6 +342,8 @@ and version 1.3 or later is part of all distributions of LaTeX version
% columns and east for left columns). }
% \changes{v0.6}{2013/04/22}{Use reverseconnect to set the left and
% right margins correctly in some classes.}
+% \changes{v0.8}{2013/04/24}{replaced marginpar by marginnote on the
+% nosidenote option to allow MNOTES in floats.}
% \begin{macrocode}
\if@mnotes@basic
\setlength{\marginparsep}{6pt}\setlength{\marginparwidth}{\MNOTEWIDTH}
@@ -338,7 +351,7 @@ and version 1.3 or later is part of all distributions of LaTeX version
\marginpar%
[{\MNFONT\raggedleft\color{#1}\em #2}]%
{\MNFONT\raggedright\color{#1}\em #2}}%
-\else
+\else% not basic
\newcommand{\MNOTEon}[2][\MNCOLOUR]{
\setlength{\marginparsep}{6pt}\setlength{\marginparwidth}{\MNOTEWIDTH}
\begin{tikzpicture}[remember picture, baseline=-0.75ex]%
diff --git a/Master/texmf-dist/source/latex/mnotes/mnotes.ins b/Master/texmf-dist/source/latex/mnotes/mnotes.ins
index 9b81e522b8a..41807100619 100644
--- a/Master/texmf-dist/source/latex/mnotes/mnotes.ins
+++ b/Master/texmf-dist/source/latex/mnotes/mnotes.ins
@@ -1,6 +1,6 @@
%% LaTeX2e file `mnotes.ins'
%% generated by the `filecontents' environment
-%% from source `mnotes' on 2013/04/22.
+%% from source `mnotes' on 2013/04/23.
%%
\def\batchfile{mnotes.ins}
\input docstrip.tex
diff --git a/Master/texmf-dist/tex/latex/mnotes/mnotes.sty b/Master/texmf-dist/tex/latex/mnotes/mnotes.sty
index 5d286727bec..32cfb193619 100644
--- a/Master/texmf-dist/tex/latex/mnotes/mnotes.sty
+++ b/Master/texmf-dist/tex/latex/mnotes/mnotes.sty
@@ -21,7 +21,7 @@
%% 2003/12/01 or later.
%%
\ProvidesPackage{mnotes}[%
- 2013/20/04 v0.6 margin notes for collaborative document editing]
+ 2013/20/04 v0.7 margin notes for collaborative document editing]
\expandafter\ifx\csname mnotespaperwidth\endcsname\relax
\newdimen\mnotespaperwidth
\mnotespaperwidth1.05\paperwidth
@@ -35,14 +35,14 @@
\newif\if@mnotes@basic
\@mnotes@basicfalse
\newif\if@mnotes@sidenotes
-\@mnotes@sidenotestrue
+\@mnotes@sidenotesfalse
\newif\if@mnotes@scale
\@mnotes@scalefalse
\newif\if@mnotes@reverseconnect
\@mnotes@reverseconnectfalse
\RequirePackage{kvoptions}
\DeclareVoidOption{basic}{\@mnotes@basictrue}
-\DeclareVoidOption{nosidenotes}{\@mnotes@sidenotesfalse}
+\DeclareVoidOption{sidenotes}{\@mnotes@sidenotestrue}
\DeclareVoidOption{hide}{\@mnotes@hidetrue \AtEndOfPackage{\HideMNOTES{}}}
\DeclareVoidOption{reverseconnect}{\@mnotes@reverseconnecttrue}
\SetupKeyvalOptions{family=mnotes, prefix=mnotes@}
@@ -64,15 +64,19 @@
\ProcessKeyvalOptions{mnotes}
\if@twocolumn\if@mnotes@scale\hoffset\pdfpagewidth
\advance\hoffset-\paperwidth
- \hoffset.5\hoffset\fi
-\RequirePackage{ifoddpage}
+ \hoffset.5\hoffset\fi\fi
\if@mnotes@basic
-\RequirePackage{color}
-\else
-\if@mnotes@sidenotes
- \RequirePackage{sidenotes}
-\fi
-\RequirePackage{tikz}
+ \RequirePackage{color}
+ \newif\ifoddpage %% define \ifoddpage even though it's not used to
+\else %% avoid extra bracket error
+ \if@mnotes@sidenotes
+ \RequirePackage{sidenotes}
+ \else
+ \RequirePackage{marginnote}
+ \renewcommand\marginpar\marginnote
+ \fi
+ \RequirePackage{tikz}
+ \RequirePackage{ifoddpage}
\fi
\if@mnotes@basic
\setlength{\marginparsep}{6pt}\setlength{\marginparwidth}{\MNOTEWIDTH}
@@ -80,7 +84,7 @@
\marginpar%
[{\MNFONT\raggedleft\color{#1}\em #2}]%
{\MNFONT\raggedright\color{#1}\em #2}}%
-\else
+\else% not basic
\newcommand{\MNOTEon}[2][\MNCOLOUR]{
\setlength{\marginparsep}{6pt}\setlength{\marginparwidth}{\MNOTEWIDTH}
\begin{tikzpicture}[remember picture, baseline=-0.75ex]%