From 00025138cae4c9da826a4ff4982dc2c9aed2c28e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 5 Nov 2014 23:11:10 +0000 Subject: mnotes (5nov14) git-svn-id: svn://tug.org/texlive/trunk@35521 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/mnotes/mnotes.sty | 28 +++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mnotes') 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]% -- cgit v1.2.3