fixmetodonotes (29apr13)

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

4 files changed, 14 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/fixmetodonotes/README b/Master/texmf-dist/doc/latex/fixmetodonotes/README
index ae6c7e7118e..eb56e269dad 100644
--- a/Master/texmf-dist/doc/latex/fixmetodonotes/README
+++ b/Master/texmf-dist/doc/latex/fixmetodonotes/README
@@ -22,7 +22,7 @@ or
 
 To show a list of pending notes, together with links to their pages, use
 
-    \listofnote
+    \listofnotes
 
 The list of notes will be shown like a table of content or a list of figures.
 
@@ -36,7 +36,8 @@ It is possible to add declare new kinds of notes using the `\defnote`
 command. Notes can be declared as _margin_ or _inline_ notes. It is also
 possible to specify new ways to mark the text.
 
-To define a new kind of note marginal note `REMOVE` with crossed out text use
+To define a new kind of note called `REMOVE` that displays a margin note
+and crosses out the text, use
 
     \defnote{REMOVE}{margin}{\sout}
 
diff --git a/Master/texmf-dist/source/latex/fixmetodonotes/fixmetodonotes.dtx b/Master/texmf-dist/source/latex/fixmetodonotes/fixmetodonotes.dtx
index bd0942ec48a..b41a1b6e060 100644
--- a/Master/texmf-dist/source/latex/fixmetodonotes/fixmetodonotes.dtx
+++ b/Master/texmf-dist/source/latex/fixmetodonotes/fixmetodonotes.dtx
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fixmetodonotes}[2012/09/17 v0.2.1]
+\ProvidesPackage{fixmetodonotes}[2013/04/28 v0.2.2]
 
 
 \newif\if@NOTES@enabled \@NOTES@enabledtrue
@@ -24,11 +24,9 @@
 \RequirePackage[titles]{tocloft}
 
 \newcommand{\listnotesname}{List of notes}
-\newlistof{note}{notes}{\listnotesname}
+\newlistof{NOTES@note}{notes}{\listnotesname}
 
-\if@NOTES@enabled\else
-  \renewcommand{\listofnote}{}
-\fi
+\newcommand{\listofnotes}{\if@NOTES@enabled\listofNOTES@note\fi}
 
 \newcommand{\@HUGE}{\fontsize{100}{120}\selectfont}
 \newcommand{\@wmstyle}{\color{red}\transparent{0.1}\@HUGE}
@@ -58,9 +56,9 @@
 \newcommand{\NOTES@usemarker}[2]{\csname NOTES@#1marker\endcsname{#2}{red}}
 
 \newcommand{\NOTES@addtolist}[2]{%
-  \refstepcounter{note}%
+  \refstepcounter{NOTES@note}%
   \phantomsection%
-  \addcontentsline{notes}{note}{\protect\numberline{\thenote}{{#1}: {#2}}}%
+  \addcontentsline{notes}{NOTES@note}{\protect\numberline{\theNOTES@note}{{#1}: {#2}}}%
 }
 
 \newcommand{\NOTES@defnoteimpl}[4]{%
diff --git a/Master/texmf-dist/source/latex/fixmetodonotes/fixmetodonotes.ins b/Master/texmf-dist/source/latex/fixmetodonotes/fixmetodonotes.ins
index 1a1070362e1..bc23a518d5f 100644
--- a/Master/texmf-dist/source/latex/fixmetodonotes/fixmetodonotes.ins
+++ b/Master/texmf-dist/source/latex/fixmetodonotes/fixmetodonotes.ins
@@ -1,7 +1,7 @@
 \input docstrip.tex
 \keepsilent
 
-\usedir{tex/late/fixmetodonotes}
+\usedir{tex/latex/fixmetodonotes}
 
 \preamble
 
diff --git a/Master/texmf-dist/tex/latex/fixmetodonotes/fixmetodonotes.sty b/Master/texmf-dist/tex/latex/fixmetodonotes/fixmetodonotes.sty
index 8a7f8592a21..f8c832e8d9d 100644
--- a/Master/texmf-dist/tex/latex/fixmetodonotes/fixmetodonotes.sty
+++ b/Master/texmf-dist/tex/latex/fixmetodonotes/fixmetodonotes.sty
@@ -20,7 +20,7 @@
 %% for more details.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fixmetodonotes}[2012/09/17 v0.2.1]
+\ProvidesPackage{fixmetodonotes}[2013/04/28 v0.2.2]
 
 \newif\if@NOTES@enabled \@NOTES@enabledtrue
 
@@ -43,11 +43,9 @@
 \RequirePackage[titles]{tocloft}
 
 \newcommand{\listnotesname}{List of notes}
-\newlistof{note}{notes}{\listnotesname}
+\newlistof{NOTES@note}{notes}{\listnotesname}
 
-\if@NOTES@enabled\else
-  \renewcommand{\listofnote}{}
-\fi
+\newcommand{\listofnotes}{\if@NOTES@enabled\listofNOTES@note\fi}
 
 \newcommand{\@HUGE}{\fontsize{100}{120}\selectfont}
 \newcommand{\@wmstyle}{\color{red}\transparent{0.1}\@HUGE}
@@ -76,9 +74,9 @@
 \newcommand{\NOTES@usemarker}[2]{\csname NOTES@#1marker\endcsname{#2}{red}}
 
 \newcommand{\NOTES@addtolist}[2]{%
-  \refstepcounter{note}%
+  \refstepcounter{NOTES@note}%
   \phantomsection%
-  \addcontentsline{notes}{note}{\protect\numberline{\thenote}{{#1}: {#2}}}%
+  \addcontentsline{notes}{NOTES@note}{\protect\numberline{\theNOTES@note}{{#1}: {#2}}}%
 }
 
 \newcommand{\NOTES@defnoteimpl}[4]{%