fixmetodonotes (17sep12)

git-svn-id: svn://tug.org/texlive/trunk@27685 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 26 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/fixmetodonotes/fixmetodonotes.sty b/Master/texmf-dist/tex/latex/fixmetodonotes/fixmetodonotes.sty
index e166dc1bf8c..8a7f8592a21 100644
--- a/Master/texmf-dist/tex/latex/fixmetodonotes/fixmetodonotes.sty
+++ b/Master/texmf-dist/tex/latex/fixmetodonotes/fixmetodonotes.sty
@@ -20,12 +20,24 @@
 %% for more details.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fixmetodonote}[2012/06/14 v0.1]
+\ProvidesPackage{fixmetodonotes}[2012/09/17 v0.2.1]
+
+\newif\if@NOTES@enabled \@NOTES@enabledtrue
+
+\DeclareOption{enabled}{} % default
+\DeclareOption{disabled}{\@NOTES@enabledfalse}
+
+\newif\if@watermark \@watermarktrue
+
+\DeclareOption{watermark}{} % default
+\DeclareOption{nowatermark}{\@watermarkfalse}
+
+\ProcessOptions\relax
 
 \RequirePackage{graphicx}
 \RequirePackage{color}
 \RequirePackage{transparent}
-\RequirePackage{watermark}
+\if@watermark\RequirePackage{watermark}\fi
 \RequirePackage{fix-cm}
 \RequirePackage[normalem]{ulem}
 \RequirePackage[titles]{tocloft}
@@ -33,6 +45,10 @@
 \newcommand{\listnotesname}{List of notes}
 \newlistof{note}{notes}{\listnotesname}
 
+\if@NOTES@enabled\else
+  \renewcommand{\listofnote}{}
+\fi
+
 \newcommand{\@HUGE}{\fontsize{100}{120}\selectfont}
 \newcommand{\@wmstyle}{\color{red}\transparent{0.1}\@HUGE}
 \newcommand{\@wmtext}{\textsc{DRAFT}}
@@ -65,12 +81,16 @@
   \addcontentsline{notes}{note}{\protect\numberline{\thenote}{{#1}: {#2}}}%
 }
 
+\newcommand{\NOTES@defnoteimpl}[4]{%
+  \NOTES@usemarker{#3}{#2}%
+  #4{#1}%
+  \NOTES@addtolist{#2}{#1}%
+  \if@watermark\@DRAFTwatermark\fi%
+}
+
 \newcommand{\defnote}[3]{%
   \global\expandafter\newcommand\csname #1\endcsname[1]{%
-    \NOTES@usemarker{#2}{#1}%
-    #3{##1}%
-    \NOTES@addtolist{#1}{##1}%
-    \@DRAFTwatermark%
+    \if@NOTES@enabled\NOTES@defnoteimpl{##1}{#1}{#2}{#3}\fi%
   }%
 }