fixme 3.2 (12apr06)

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

8 files changed, 279 insertions, 164 deletions

diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index 7cf6fee0987..4023f7a414c 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -42,7 +42,8 @@ sub main
          "etaremune", "esint",
          "esint-type1", "ethiop", "europecv", "everypage", "exercise",
          "exteps", 
-       "featpost", "flagderiv", "flippdf", "floatflt", "floatrow", "flowfram",
+       "featpost", "fixme", "flagderiv", "flippdf", "floatflt",
+         "floatrow", "flowfram", 
          "fltpoint", "fmtcount", "fncychap", "fontspec", "formular",
          "fourier", "free-math-font-survey",
        "genmisc", "glossary", "gost", "graphics", "graphicx-psmin",
diff --git a/Master/texmf-dist/doc/latex/fixme/NEWS b/Master/texmf-dist/doc/latex/fixme/NEWS
index 119a6907e76..bf5a7770057 100644
--- a/Master/texmf-dist/doc/latex/fixme/NEWS
+++ b/Master/texmf-dist/doc/latex/fixme/NEWS
@@ -4,7 +4,7 @@
 
 
 
-*** Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 Didier Verna
+*** Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
 
 This file is part of FiXme.
 
@@ -18,9 +18,19 @@ version 1999/06/01 or later.
 
 FiXme consists of the files listed in the file `README'.
 
+* Version 3.2
+=============
+** Added the marginclue layout option
+which only signals a fixme in the margin, withtout the actual contents.
+** Fix incompatibility with AMS-Book
+reported by Claude Lacoursière: \@starttoc takes 2 arguments.
+** Support for Croatian
+thanks to Marcel Maretic <marcel@fsb.hr>.
+** Fix incompatibility with Beamer
+reported by Akim Demaille: protect contents of lox file.ug in environments.
 
 * Version 3.1
-===============
+=============
 ** Fix bug in environments
 reported by Arnold Beckmann: they were visible in final mode.
 
diff --git a/Master/texmf-dist/doc/latex/fixme/fixme.el b/Master/texmf-dist/doc/latex/fixme/fixme.el
index 2cacb79c542..be652c66eb6 100644
--- a/Master/texmf-dist/doc/latex/fixme/fixme.el
+++ b/Master/texmf-dist/doc/latex/fixme/fixme.el
@@ -1,6 +1,6 @@
 ;;; fixme.el --- AUC-TeX style file for FiXme
 
-;; Copyright (C) 2000, 2002, 2004 Didier Verna.
+;; Copyright (C) 2000, 2002, 2004, 2006 Didier Verna.
 
 ;; Author:        Didier Verna <didier@lrde.epita.fr>
 ;; Maintainer:    Didier Verna <didier@lrde.epita.fr>
@@ -39,6 +39,7 @@
 
       '("FXInline")
       '("FXMargin")
+      '("FXMarginClue")
       '("FXFootnote")
       '("FXUser")
       '("fixmeindexname")
diff --git a/Master/texmf-dist/doc/latex/fixme/fixme.pdf b/Master/texmf-dist/doc/latex/fixme/fixme.pdf
index c779a29927f..d2ff50aceaa 100644
--- a/Master/texmf-dist/doc/latex/fixme/fixme.pdf
+++ b/Master/texmf-dist/doc/latex/fixme/fixme.pdf
diff --git a/Master/texmf-dist/source/latex/fixme/fixme.dtx b/Master/texmf-dist/source/latex/fixme/fixme.dtx
index b2a51fc947a..b9d69eccdec 100644
--- a/Master/texmf-dist/source/latex/fixme/fixme.dtx
+++ b/Master/texmf-dist/source/latex/fixme/fixme.dtx
@@ -2,9 +2,9 @@
 %
 % fixme.dtx --- Doc file for the FiXme package (code and documentation)
 %
-% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Didier Verna.
+% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna.
 %
-% PRCS: $Id: fixme.dtx 1.68 Mon, 31 Jan 2005 14:39:45 +0100 didier $
+% PRCS: $Id: fixme.dtx 1.72 Wed, 12 Apr 2006 15:15:39 +0200 didier $
 %
 % Author:        Didier Verna <didier@lrde.epita.fr>
 % Maintainer:    Didier Verna <didier@lrde.epita.fr>
@@ -44,7 +44,7 @@
 % \fi
 %
 % \catcode`\¡=14
-% \CheckSum{800}
+% \CheckSum{860}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -62,11 +62,11 @@
 %%   Right brace   \}     Tilde         \~}
 %
 % ^^A $Format: "% \\newcommand\\version{v$Version$}"$
-% \newcommand\version{v3.1}
+% \newcommand\version{v3.2}
 % ^^A $Format: "% \\newcommand\\releasedate{$ReleaseDate$}"$
-% \newcommand\releasedate{2005/01/31}
+% \newcommand\releasedate{2006/04/12}
 % ^^A $Format: "% \\newcommand\\packagecopyright{$LaTeXCopyright$}"$
-% \newcommand\packagecopyright{Copyright \copyright{} 1998, 1999, 2000, 2001, 2002, 2004, 2005 Didier Verna}
+% \newcommand\packagecopyright{Copyright \copyright{} 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna}
 % \newcommand\fixme{\textsf{FiXme}}
 % \newcommand\auctex{AUC-\TeX}
 % \MakeShortVerb{\|}
@@ -146,9 +146,9 @@
 % in the index if required.\par
 % The \fixme{} environments behave exactly the same way as their macro
 % counterpart, except for the layout (see section \ref{sec:layout}): as they
-% are meant for longer notes, the layout is always \texttt{inline} (and
-% possibly \texttt{index} if so required). By default, \fixme{} environments
-% are typeset in a \texttt{quotation} one.
+% are meant for longer notes, the layout is always \texttt{inline}. The
+% \texttt{index} and \texttt{marginclue} layouts are still honored however. By
+% default, \fixme{} environments are typeset in a \texttt{quotation} one.
 %
 % \subsection{Controlling the behavior of \fixme\label{sec:behavior}}
 % \DescribeEnv{final}
@@ -173,18 +173,40 @@
 % itself behaves this way.\par
 %
 % \subsection{Controlling the notes layout\label{sec:layout}}
+% \fixme{} notes can appear in several forms (that can be combined) in your
+% document.
+% \subsubsection{Global layout}
 % \DescribeEnv{inline}
 % \DescribeEnv{margin}
+% \DescribeEnv{marginclue}
 % \DescribeEnv{footnote}
 % \DescribeEnv{index}
-% \fixme{} notes can appear in several forms (that can be combined) in your
-% document. The forms currently supported are: inline (directly in the text),
-% marginal notes, footnotes, and index entries. To activate a particular
-% layout, use the corresponding package option. By default, only the
-% \texttt{margin} layout is active.\par
+% The layout forms currently supported are: inline (directly in the text),
+% marginal notes, marginal clues (see below), footnotes, and index entries. To
+% activate a particular layout globally (that is, for the whole document), use
+% the corresponding package option. By default, only the \texttt{margin}
+% layout is active.\par
 % Each layout option has a counterpart that deactivates it. The counterpart
 % option has the same name, prefixed with \texttt{no}. For instance, if you
 % don't want marginal notes, use the \texttt{nomargin} option.\par
+% Finally, note that \fixme{} environments behave in a special way: they are
+% always typeset \texttt{inline}, regardless of your layout settings (they
+% respect your whish for index and marginal clues though).\par
+%
+% \subsubsection{Marginal Clues}
+% Sometimes, marginal notes are too narrow for what you want to put in them,
+% so you would switch to an inline or a footnote layout. But then, it is more
+% difficult to keep track of the \fixme{} note's location on the page.\par
+% As of version 3.2, \fixme{} provides a special layout called ``marginal
+% clue'' to help locating the notes: a marginal clue does not display the
+% note's contents, but only an indication that there is a note at that place.
+% So you have to use another layout form (typically inline or footnote) in
+% order to get the actual contents.\par
+% Obvisouly, \texttt{margin} and \texttt{marginclue} are mutually exclusive.
+% If you try to activate both, only the most recently activated form will be
+% enabled (and you'll get a notice in the compilation log).
+%
+% \subsubsection{Local Layout}
 % \DescribeMacro{\fixme[]}
 % \DescribeMacro{\fxnote[]}
 % \DescribeMacro{\fxwarning[]}
@@ -192,9 +214,9 @@
 % As of version 3.0, \fixme{} provides a way to change the selected layout(s)
 % on a per-note basis: each note insertion command takes an optional first
 % argument that overrides the global layout. This argument consists of one or
-% more layout options (\texttt{inline}, \texttt{margin}, \texttt{footnote} and
-% \texttt{index}) separated by commas. Remember that local layouts
-% \emph{override} the global ones; they don't add to it.\par
+% more layout options (\texttt{inline}, \texttt{margin}, \texttt{marginclue},
+% \texttt{footnote} and \texttt{index}) separated by commas. Remember that
+% local layouts \emph{override} the global ones; they don't add to it.\par
 % On what occasion would one want to modify the layout for a particular note~?
 % Here is a typical situation: suppose you have a document in which \fixme{}
 % notes are typeset as margin paragraphs (this is the default). You would not
@@ -202,9 +224,6 @@
 % \LaTeX{} (margin paragraphs are floats). In such a case, you would rather
 % inline the note, which can be done with something like
 % |\fixme[inline]{blah}|.\par
-% Finally, note that \fixme{} environments behave in a special way: they are
-% always typeset \texttt{inline}, regardless of your layout settings (they
-% respect your whish for an index though).\par
 %
 % \subsection{Controlling the notes logging}
 % \DescribeEnv{silent}
@@ -243,6 +262,10 @@
 % These layouts are implemented thanks to the corresponding |\FX*| macros that
 % you can redefine if you whish. Each such macro takes two mandatory
 % arguments: the prefix and the note, in that order.\par
+% \DescribeMacro{\FXMarginCLue}
+% The special \texttt{marginclue} layout only outputs the prefix mentioned
+% above. Its layout is controlled by the macro |\FXMarginClue| which takes the
+% prefix as its only mandatory argument.
 % \DescribeMacro{\FXIndex}
 % The |\FXIndex| macro is used for the \texttt{index} layout. All \fixme{}
 % index entries appear under the ``\fixme{}'' key in the symbols section.
@@ -291,9 +314,10 @@
 % \DescribeEnv{german}
 % \DescribeEnv{ngerman}
 % \DescribeEnv{danish}
-% \fixme{} currently supports English, French, Spanish, Italian, German and
-% Danish. You can select the language you want to use by passing the
-% corresponding option (these options are usually given directly to
+% \DescribeEnv{croatian}
+% \fixme{} currently supports English, French, Spanish, Italian, German,
+% Danish and Croatian. You can select the language you want to use by passing
+% the corresponding option (these options are usually given directly to
 % |\documentclass{}| which in turn passes them to all packages). The
 % \texttt{french} and \texttt{francais} options are synonyms. The
 % \texttt{german} and \texttt{ngerman} options are currently equivalent.\par
@@ -344,29 +368,38 @@
 %
 % \section{Changes}
 % \begin{itemize}
+% \item[v3.2] Added the marginclue layout option which only signals a fixme in
+%   the margin, withtout the actual contents.\\
+%   Fix incompatibility with \texttt{amsbook} reported by Claude
+%   Lacoursi\`ere: \cs{@starttoc} takes two arguments.\\
+%   Support for Croatian thanks to Marcel Maretic |<marcel@fsb.hr>|.\\
+%   Fix incompatibility with Beamer reported by Akim Demaille: protect
+%   contents of lox file.
 % \item[v3.1] Fix bug reported by Arnold Beckmann: the environments were
-% visible in final mode.
+%   visible in final mode.
 % \item[v3.0] Added environments corresponding to the note insertion
-% commands.\\
-% Added an optional first argument to the note insertion commands
-% to change the layout locally.\\
-% Fix bug reported by Akim Demaille: marginal notes could mess up the
-% document's layout by flushing it right.
-% \item[v2.2] New option \texttt{silent} to suppress notes logging\\
-% Support for Danish thanks to Kim Rud Bille |<krbi01@control.auc.dk>|
+%   commands.\\
+%   Added an optional first argument to the note insertion commands
+%   to change the layout locally.\\
+%   Fix bug reported by Akim Demaille: marginal notes could mess up the
+%   document's layout by flushing it right.
+% \item[v2.2] New option \texttt{silent} to suppress notes logging.\\
+%   Support for Danish thanks to Kim Rud Bille |<krbi01@control.auc.dk>|.
 % \item[v2.1] Use |\nobreakspace| instead of the tilda character. This avoids
-% conflicts with Babel in Spanish environments.\\
-% Fix bug reported by Knut Lickert: index entries were unconditionally built.
-% \item[v2.0] New feature: note levels\\
-% New feature: \fixme{} note counters and usage summary\\
-% Suggestions from Kasper B. Graversen |<kbg@dkik.dk>|\\
-% Support for Spanish thanks to Agust\'in Mart\'in |<agusmba@terra.es>|
+%   conflicts with Babel in Spanish environments.\\
+%   Fix bug reported by Knut Lickert: index entries were unconditionally built.
+% \item[v2.0] New feature: note levels.\\
+%   New feature: \fixme{} note counters and usage summary.\\
+%   Suggestions from Kasper B. Graversen |<kbg@dkik.dk>|.\\
+%   Support for Spanish thanks to Agust\'in Mart\'in |<agusmba@terra.es>|
 % \item[v1.5] New appearance option: \texttt{inline}.
-% \item[v1.4] Support for the koma-script classes\\
-% Fix bug reported by Ulf Jaenicke-Roessler: the |\listoffixmes| command
-% didn't work when called before the first \fixme{} note.
-% \item[v1.3] Support for Italian thanks to Riccardo Murri |<murri@phc.unipi.it>|
-% \item[v1.2] Support for German thanks to Harald Harders |<h.harders@tu-bs.de>|
+% \item[v1.4] Support for the koma-script classes.\\
+%   Fix bug reported by Ulf Jaenicke-Roessler: the |\listoffixmes| command
+%   didn't work when called before the first \fixme{} note.
+% \item[v1.3] Support for Italian thanks to Riccardo Murri
+% |<murri@phc.unipi.it>|.
+% \item[v1.2] Support for German thanks to Harald Harders
+% |<h.harders@tu-bs.de>|.
 % \end{itemize}
 %
 % \StopEventually{\par Well, I think that's it. Enjoy using \fixme{}!
@@ -379,7 +412,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 ¡$Format: "\\ProvidesPackage{fixme}[$ReleaseDate: 2004/10/19$ v$Version: 2.3$"$
-\ProvidesPackage{fixme}[2005/01/31 v3.1
+\ProvidesPackage{fixme}[2006/04/12 v3.2
                         Insert fixme notes in your documents]
 
 \RequirePackage{ifthen}
@@ -409,6 +442,7 @@
 %   \end{macro}
 % \end{macro}
 %    \begin{macrocode}
+\let\l@fixme\l@figure
 \newcommand\listoffixmes{}
 \def\listoffixmes@final{}
 \def\listoffixmes@draft{%
@@ -418,6 +452,13 @@
   }
 
 %    \end{macrocode}
+% The \texttt{amsbook} class has the very ugly idea of redefining the
+% \cs{@starttoc} command to take two arguments. Therefore, I need to provide a
+% specific version of the \cs{listoffixmes} macro:
+%    \begin{macrocode}
+\def\listoffixmes@draft@amsbook{\@starttoc{lox}\listfixmename}
+
+%    \end{macrocode}
 % \begin{macro}{\listfixmename}
 %   In order to redefine the list title, users have to call |\renewcommand|.
 %   I don't like this much: it would be cleaner to provide a real command
@@ -432,9 +473,7 @@
 % \subsubsection{Standard classes}
 % \begin{macro}{\listoffixmes@pretoc@article}
 %   \begin{macro}{\listoffixmes@posttoc@article}
-%     \begin{macro}{\l@fixme@article}
-%       Let's start with the article version:
-%     \end{macro}
+%     Let's start with the article version:
 %   \end{macro}
 % \end{macro}
 %    \begin{macrocode}
@@ -443,14 +482,11 @@
     \@mkboth{\MakeUppercase\listfixmename}{\MakeUppercase\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@article{}
-\def\l@fixme@article{\@dottedtocline{1}{1.5em}{2.3em}}
 
 %    \end{macrocode}
 % \begin{macro}{\listoffixmes@pretoc@report}
 %   \begin{macro}{\listoffixmes@posttoc@report}
-%     \begin{macro}{\l@fixme@report}
-%       Here's the report version:
-%     \end{macro}
+%     Here's the report version:
 %   \end{macro}
 % \end{macro}
 %    \begin{macrocode}
@@ -464,14 +500,11 @@
     \@mkboth{\MakeUppercase\listfixmename}{\MakeUppercase\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@report{\if@restonecol\twocolumn\fi}
-\def\l@fixme@report{\@dottedtocline{1}{1.5em}{2.3em}}
 
 %    \end{macrocode}
 % \begin{macro}{\listoffixmes@pretoc@book}
 %   \begin{macro}{\listoffixmes@posttoc@book}
-%     \begin{macro}{\l@fixme@book}
-%       And here's the book version:
-%     \end{macro}
+%     And here's the book version:
 %   \end{macro}
 % \end{macro}
 %    \begin{macrocode}
@@ -485,16 +518,13 @@
     \@mkboth{\MakeUppercase\listfixmename}{\MakeUppercase\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@book{\if@restonecol\twocolumn\fi}
-\def\l@fixme@book{\@dottedtocline{1}{1.5em}{2.3em}}
 
 %    \end{macrocode}
 %
 % \subsubsection{koma-script classes}
 % \begin{macro}{\listoffixmes@pretoc@scrartcl}
 %   \begin{macro}{\listoffixmes@posttoc@scrartcl}
-%     \begin{macro}{\l@fixme@scrartcl}
-%       Let's start with the scrartcl version:
-%     \end{macro}
+%     Let's start with the scrartcl version:
 %   \end{macro}
 % \end{macro}
 %    \begin{macrocode}
@@ -503,14 +533,11 @@
     \@mkboth{\listfixmename}{\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@scrartcl{}
-\def\l@fixme@scrartcl{\@dottedtocline{1}{1.5em}{2.3em}}
 
 %    \end{macrocode}
 % \begin{macro}{\listoffixmes@pretoc@scrreprt}
 %   \begin{macro}{\listoffixmes@posttoc@scrreprt}
-%     \begin{macro}{\l@fixme@scrreprt}
-%       Here's the scrreprt version:
-%     \end{macro}
+%     Here's the scrreprt version:
 %   \end{macro}
 % \end{macro}
 %    \begin{macrocode}
@@ -524,14 +551,11 @@
     \@mkboth{\listfixmename}{\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@scrreprt{\if@restonecol\twocolumn\fi}
-\def\l@fixme@scrreprt{\@dottedtocline{1}{1.5em}{2.3em}}
 
 %    \end{macrocode}
 % \begin{macro}{\listoffixmes@pretoc@scrbook}
 %   \begin{macro}{\listoffixmes@posttoc@scrbook}
-%     \begin{macro}{\l@fixme@scrbook}
-%       And here's the scrbook version:
-%     \end{macro}
+%     And here's the scrbook version:
 %   \end{macro}
 % \end{macro}
 %    \begin{macrocode}
@@ -545,15 +569,16 @@
     \@mkboth{\listfixmename}{\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@scrbook{\if@restonecol\twocolumn\fi}
-\def\l@fixme@scrbook{\@dottedtocline{1}{1.5em}{2.3em}}
 
 %    \end{macrocode}
 %
 % \subsection{Layout macros}
 % \begin{macro}{\FXInline}
 %   \begin{macro}{\FXMargin}
-%     \begin{macro}{\FXFootnote}
-%       The macros to implement different layouts for the fixme notes:
+%     \begin{macro}{\FXMarginCLue}
+%       \begin{macro}{\FXFootnote}
+%         The macros to implement different layouts for the fixme notes:
+%       \end{macro}
 %     \end{macro}
 %   \end{macro}
 % \end{macro}
@@ -562,6 +587,8 @@
   \textbf{#1}: \emph{#2}}
 \newcommand\FXMargin[2]{%
   \marginpar{\footnotesize\raggedleft\textbf{#1}: \emph{#2}}}
+\newcommand\FXMarginClue[1]{%
+  \marginpar{\footnotesize\raggedleft\textbf{#1}~!}}
 \newcommand\FXFootnote[2]{%
   \footnote{\textbf{#1}: \emph{#2}}}
 
@@ -614,11 +641,34 @@
 %    \begin{macrocode}
 \newif\iffixme@inline
 \newif\iffixme@margin
+\newif\iffixme@marginclue
 \newif\iffixme@footnote
 \newif\iffixme@user
 \newif\iffixme@index
 
 %    \end{macrocode}
+% Setters for these booleans (some might required special treatment):
+%    \begin{macrocode}
+\let\fixme@setinline\fixme@inlinetrue
+\def\fixme@setmargin{%
+  \iffixme@marginclue%
+    \PackageWarning{FiXme}{%
+      Marginal notes requested; tunrning marginal clues off}%
+    \fixme@margincluefalse%
+  \fi%
+  \fixme@margintrue}
+\def\fixme@setmarginclue{%
+  \iffixme@margin%
+    \PackageWarning{FiXme}{%
+      Marginal clues requested; tunrning marginal notes off}%
+    \fixme@marginfalse%
+  \fi%
+  \fixme@margincluetrue}
+\let\fixme@setfootnote\fixme@fottnotetrue
+\let\fixme@setuser\fixme@usertrue
+\let\fixme@setindex\fixme@indextrue
+
+%    \end{macrocode}
 % \begin{macro}{\fixme@text}
 %   This macro implements the common (textual) part of all notes:
 % \end{macro}
@@ -626,16 +676,19 @@
 \def\fixme@text#1#2{%
   \iffixme@inline\FXInline{#1}{#2}\fi%
   \iffixme@margin\FXMargin{#1}{#2}\fi%
+  \iffixme@marginclue\FXMarginClue{#1}\fi%
   \iffixme@footnote\FXFootnote{#1}{#2}\fi%
   \iffixme@user\FXUser{#1}{#2}\fi}
 
 %    \end{macrocode}
 % Options that control which layouts are selected:
 %    \begin{macrocode}
-\DeclareOption{inline}{\fixme@inlinetrue}
+\DeclareOption{inline}{\fixme@setinline}
 \DeclareOption{noinline}{\fixme@inlinefalse}
-\DeclareOption{margin}{\fixme@margintrue}
+\DeclareOption{margin}{\fixme@setmargin}
 \DeclareOption{nomargin}{\fixme@marginfalse}
+\DeclareOption{marginclue}{\fixme@setmarginclue}
+\DeclareOption{nomarginclue}{\fixme@margincluefalse}
 \DeclareOption{footnote}{\fixme@footnotetrue}
 \DeclareOption{nofootnote}{\fixme@footnotefalse}
 \DeclareOption{user}{\fixme@usertrue}
@@ -726,10 +779,10 @@
   \fixme@text{\fixmenoteprefix}{#1}%
   \iffixme@index\FXIndex{\fixmenoteindexname\thefixmenotecount: #1}\fi%
   \iffixme@silent\else\FXNote{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmenoteprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmenoteprefix: #1}}
 \def\fixme@note@final#1{%
   \iffixme@silent\else\FXNote{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmenoteprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmenoteprefix: #1}}
 
 %    \end{macrocode}
 % \begin{macro}{\fixmewarningprefix}
@@ -748,10 +801,10 @@
   \fixme@text{\fixmewarningprefix}{#1}%
   \iffixme@index\FXIndex{\fixmewarningindexname\thefixmewarningcount: #1}\fi%
   \iffixme@silent\else\FXWarning{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmewarningprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmewarningprefix: #1}}
 \def\fixme@warning@final#1{%
   \iffixme@silent\else\FXWarning{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmewarningprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmewarningprefix: #1}}
 
 %    \end{macrocode}
 % \begin{macro}{\fixmeerrorprefix}
@@ -770,10 +823,10 @@
   \fixme@text{\fixmeerrorprefix}{#1}%
   \iffixme@index\FXIndex{\fixmeerrorindexname\thefixmeerrorcount: #1}\fi%
   \iffixme@silent\else\FXError{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmeerrorprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmeerrorprefix: #1}}
 \def\fixme@error@final#1{%
   \iffixme@silent\else\FXError{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmeerrorprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmeerrorprefix: #1}}
 
 %    \end{macrocode}
 % \begin{macro}{\fixmefatalindexname}
@@ -788,12 +841,13 @@
 \def\fixme@fatal@draft#1{%
   \iffixme@inline\FiXmeInline{#1}\fi%
   \iffixme@margin\FiXmeMargin{#1}\fi%
+  \iffixme@marginclue\FXMarginClue{\fixmefatalprefix}\fi%
   \iffixme@footnote\FiXmeFootnote{#1}\fi%
   \iffixme@user\FiXmeUser{#1}\fi%
   \iffixme@index\FiXmeIndex{%
     \fixmefatalindexname\thefixmefatalcount: #1}\fi%
   \iffixme@silent\else\FXFatal{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmefatalprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmefatalprefix: #1}}
 \def\fixme@fatal@final#1{%
   \PackageError{FiXme}{`#1' fixme left in final version}{%
     You are processing your document in final mode,\MessageBreak
@@ -823,19 +877,21 @@
   \bgroup%
   \fixme@inlinefalse%
   \fixme@marginfalse%
+  \fixme@margincluefalse%
   \fixme@footnotefalse%
   \fixme@userfalse%
   \fixme@indexfalse%
   \@for\fixme@option:=#2\do{%
     \expandafter\ifx\csname fixme@\fixme@option true\endcsname\relax
       \PackageError{FiXme}{Unknown layout option `\fixme@option'}{%
-        You have given an invalid option to \string\fixme, %
-        or an \string\fx command.\MessageBreak
-        Valid options are `inline', `margin', `footnote' and `index'.%
-        \MessageBreak
+        You have given an invalid option to \string\fixme, or an \string\fx %
+        command.\MessageBreak
+        Valid options are `inline', `margin', `marginclue', `footnote', %
+        `user',\MessageBreak
+        and `index'.\MessageBreak
         Type X to quit, fix your document, and rerun LaTeX.}%
       \else%
-      \csname fixme@\fixme@option true\endcsname%
+      \csname fixme@set\fixme@option\endcsname%
     \fi}%
   \@@fixme{#1}{#3}%
   \egroup}
@@ -860,10 +916,14 @@
 
 \def\@fxenvbegin@draft#1#2{%
   \FXEnvBegin
-  \edef\fixme@args{inline\iffixme@index,index\fi}%
+  \edef\fixme@args{inline%
+    \iffixme@index,index\fi%
+    \iffixme@marginclue,marginclue\fi}%
   \csname#1\endcsname[\fixme@args]{#2}}
 \def\@fxenvbegin@final#1#2{
-  \edef\fixme@args{inline\iffixme@index,index\fi}%
+  \edef\fixme@args{inline%
+    \iffixme@index,index\fi%
+    \iffixme@marginclue,marginclue\fi}%
   \csname#1\endcsname[\fixme@args]{#2}
   \comment
 }
@@ -958,6 +1018,17 @@
   \renewcommand*\fixmeerrorindexname{**c@Fejl:!}
   \renewcommand*\fixmefatalindexname{}
   \renewcommand*{\listfixmename}{Rettelser}}
+\DeclareOption{croatian}{%
+  \renewcommand*\fixmenoteprefix{\fixmelogo\nobreakspace Poruka}
+  \renewcommand*\fixmewarningprefix{\fixmelogo\nobreakspace Upozorenje}
+  \renewcommand*\fixmeerrorprefix{\fixmelogo\nobreakspace Gre\v ska}
+  \renewcommand*\fixmefatalprefix{\fixmelogo}
+  \renewcommand*\fixmeindexname{\fixmelogo}
+  \renewcommand*\fixmenoteindexname{**a@Poruke:!}
+  \renewcommand*\fixmewarningindexname{**b@Upozorenja:!}
+  \renewcommand*\fixmeerrorindexname{**c@Greske:!}
+  \renewcommand*\fixmefatalindexname{}
+  \renewcommand*{\listfixmename}{Popis korekcija}}
 
 %    \end{macrocode}
 %
@@ -982,47 +1053,43 @@
   }
 
 \DeclareOption{draft}{
-  \let\fixme@note\fixme@note@draft
-  \let\fixme@warning\fixme@warning@draft
-  \let\fixme@error\fixme@error@draft
-  \let\fixme@fatal\fixme@fatal@draft
-  \let\@fxenvbegin\@fxenvbegin@draft
-  \let\@fxenvend\@fxenvend@draft
-  \let\listoffixmes\listoffixmes@draft
   \@ifclassloaded{article}{
     \let\@listoffixmes@pretoc\@listoffixmes@pretoc@article
-    \let\@listoffixmes@posttoc\@listoffixmes@posttoc@article
-    \let\l@fixme\l@fixme@article}{
+    \let\@listoffixmes@posttoc\@listoffixmes@posttoc@article}{
     \@ifclassloaded{report}{
       \let\@listoffixmes@pretoc\@listoffixmes@pretoc@report
-      \let\@listoffixmes@posttoc\@listoffixmes@posttoc@report
-      \let\l@fixme\l@fixme@report}{
+      \let\@listoffixmes@posttoc\@listoffixmes@posttoc@report}{
       \@ifclassloaded{book}{
         \let\@listoffixmes@pretoc\@listoffixmes@pretoc@book
-        \let\@listoffixmes@posttoc\@listoffixmes@posttoc@book
-        \let\l@fixme\l@fixme@book}{
+        \let\@listoffixmes@posttoc\@listoffixmes@posttoc@book}{
         \@ifclassloaded{scrartcl}{
           \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrartcl
-          \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrartcl
-          \let\l@fixme\l@fixme@scrartcl}{
+          \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrartcl}{
           \@ifclassloaded{scrreprt}{
             \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrreprt
-            \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrreprt
-            \let\l@fixme\l@fixme@scrreprt}{
+            \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrreprt}{
             \@ifclassloaded{scrbook}{
               \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrbook
-              \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrbook
-              \let\l@fixme\l@fixme@scrbook}{
-              %% Use the article layout by default.
-              \let\@listoffixmes@pretoc\@listoffixmes@pretoc@article
-              \let\@listoffixmes@posttoc\@listoffixmes@posttoc@article
-              \let\l@fixme\l@fixme@article}
+              \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrbook}{
+              \@ifclassloaded{amsbook}{
+                \let\listoffixmes@draft\listoffixmes@draft@amsbook}{
+                %% Use the article layout by default.
+                \let\@listoffixmes@pretoc\@listoffixmes@pretoc@article
+                \let\@listoffixmes@posttoc\@listoffixmes@posttoc@article}
             }
           }
         }
       }
     }
   }
+  \let\fixme@note\fixme@note@draft
+  \let\fixme@warning\fixme@warning@draft
+  \let\fixme@error\fixme@error@draft
+  \let\fixme@fatal\fixme@fatal@draft
+  \let\@fxenvbegin\@fxenvbegin@draft
+  \let\@fxenvend\@fxenvend@draft
+  \let\listoffixmes\listoffixmes@draft
+}
 
 %    \end{macrocode}
 % Put us in \texttt{english} and \texttt{final} mode, and enable the marginal
diff --git a/Master/texmf-dist/source/latex/fixme/fixme.ins b/Master/texmf-dist/source/latex/fixme/fixme.ins
index 37f55d91374..e625de9a796 100644
--- a/Master/texmf-dist/source/latex/fixme/fixme.ins
+++ b/Master/texmf-dist/source/latex/fixme/fixme.ins
@@ -36,7 +36,7 @@
 \preamble
 ^^J^^J
 %% $Format: "$TextCopyright$^^J"$
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 Didier Verna^^J
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna^^J
 This file is part of FiXme.^^J
 FiXme may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.1
diff --git a/Master/texmf-dist/tex/latex/fixme/fixme.sty b/Master/texmf-dist/tex/latex/fixme/fixme.sty
index f7a7271c984..b7e5339432a 100644
--- a/Master/texmf-dist/tex/latex/fixme/fixme.sty
+++ b/Master/texmf-dist/tex/latex/fixme/fixme.sty
@@ -8,7 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 Didier Verna
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
 
 %% This file is part of FiXme.
 
@@ -39,7 +39,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 
-\ProvidesPackage{fixme}[2005/01/31 v3.1
+\ProvidesPackage{fixme}[2006/04/12 v3.2
                         Insert fixme notes in your documents]
 
 \RequirePackage{ifthen}
@@ -47,6 +47,7 @@
 
 \newcommand*\fixmelogo{\textsf{FiXme}}
 
+\let\l@fixme\l@figure
 \newcommand\listoffixmes{}
 \def\listoffixmes@final{}
 \def\listoffixmes@draft{%
@@ -55,6 +56,8 @@
   \IfFileExists{\jobname .lox}{\@listoffixmes@posttoc}{}%
   }
 
+\def\listoffixmes@draft@amsbook{\@starttoc{lox}\listfixmename}
+
 \newcommand*\listfixmename{}
 
 \def\@listoffixmes@pretoc@article{%
@@ -62,7 +65,6 @@
     \@mkboth{\MakeUppercase\listfixmename}{\MakeUppercase\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@article{}
-\def\l@fixme@article{\@dottedtocline{1}{1.5em}{2.3em}}
 
 \def\@listoffixmes@pretoc@report{%
   \if@twocolumn
@@ -74,7 +76,6 @@
     \@mkboth{\MakeUppercase\listfixmename}{\MakeUppercase\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@report{\if@restonecol\twocolumn\fi}
-\def\l@fixme@report{\@dottedtocline{1}{1.5em}{2.3em}}
 
 \def\@listoffixmes@pretoc@book{%
   \if@twocolumn
@@ -86,14 +87,12 @@
     \@mkboth{\MakeUppercase\listfixmename}{\MakeUppercase\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@book{\if@restonecol\twocolumn\fi}
-\def\l@fixme@book{\@dottedtocline{1}{1.5em}{2.3em}}
 
 \def\@listoffixmes@pretoc@scrartcl{%
   \section*{\listfixmename%
     \@mkboth{\listfixmename}{\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@scrartcl{}
-\def\l@fixme@scrartcl{\@dottedtocline{1}{1.5em}{2.3em}}
 
 \def\@listoffixmes@pretoc@scrreprt{%
   \if@twocolumn
@@ -105,7 +104,6 @@
     \@mkboth{\listfixmename}{\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@scrreprt{\if@restonecol\twocolumn\fi}
-\def\l@fixme@scrreprt{\@dottedtocline{1}{1.5em}{2.3em}}
 
 \def\@listoffixmes@pretoc@scrbook{%
   \if@twocolumn
@@ -117,12 +115,13 @@
     \@mkboth{\listfixmename}{\listfixmename}}%
   }
 \def\@listoffixmes@posttoc@scrbook{\if@restonecol\twocolumn\fi}
-\def\l@fixme@scrbook{\@dottedtocline{1}{1.5em}{2.3em}}
 
 \newcommand\FXInline[2]{%
   \textbf{#1}: \emph{#2}}
 \newcommand\FXMargin[2]{%
   \marginpar{\footnotesize\raggedleft\textbf{#1}: \emph{#2}}}
+\newcommand\FXMarginClue[1]{%
+  \marginpar{\footnotesize\raggedleft\textbf{#1}~!}}
 \newcommand\FXFootnote[2]{%
   \footnote{\textbf{#1}: \emph{#2}}}
 
@@ -143,20 +142,43 @@
 
 \newif\iffixme@inline
 \newif\iffixme@margin
+\newif\iffixme@marginclue
 \newif\iffixme@footnote
 \newif\iffixme@user
 \newif\iffixme@index
 
+\let\fixme@setinline\fixme@inlinetrue
+\def\fixme@setmargin{%
+  \iffixme@marginclue%
+    \PackageWarning{FiXme}{%
+      Marginal notes requested; tunrning marginal clues off}%
+    \fixme@margincluefalse%
+  \fi%
+  \fixme@margintrue}
+\def\fixme@setmarginclue{%
+  \iffixme@margin%
+    \PackageWarning{FiXme}{%
+      Marginal clues requested; tunrning marginal notes off}%
+    \fixme@marginfalse%
+  \fi%
+  \fixme@margincluetrue}
+\let\fixme@setfootnote\fixme@fottnotetrue
+\let\fixme@setuser\fixme@usertrue
+\let\fixme@setindex\fixme@indextrue
+
 \def\fixme@text#1#2{%
   \iffixme@inline\FXInline{#1}{#2}\fi%
   \iffixme@margin\FXMargin{#1}{#2}\fi%
+  \iffixme@marginclue\FXMarginClue{#1}\fi%
   \iffixme@footnote\FXFootnote{#1}{#2}\fi%
   \iffixme@user\FXUser{#1}{#2}\fi}
 
-\DeclareOption{inline}{\fixme@inlinetrue}
+\DeclareOption{inline}{\fixme@setinline}
 \DeclareOption{noinline}{\fixme@inlinefalse}
-\DeclareOption{margin}{\fixme@margintrue}
+\DeclareOption{margin}{\fixme@setmargin}
 \DeclareOption{nomargin}{\fixme@marginfalse}
+\DeclareOption{marginclue}{\fixme@setmarginclue}
+\DeclareOption{nomarginclue}{\fixme@margincluefalse}
 \DeclareOption{footnote}{\fixme@footnotetrue}
 \DeclareOption{nofootnote}{\fixme@footnotefalse}
 \DeclareOption{user}{\fixme@usertrue}
@@ -202,10 +224,10 @@
   \fixme@text{\fixmenoteprefix}{#1}%
   \iffixme@index\FXIndex{\fixmenoteindexname\thefixmenotecount: #1}\fi%
   \iffixme@silent\else\FXNote{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmenoteprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmenoteprefix: #1}}
 \def\fixme@note@final#1{%
   \iffixme@silent\else\FXNote{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmenoteprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmenoteprefix: #1}}
 
 \newcommand*\fixmewarningprefix{}
 \newcommand*\fixmewarningindexname{}
@@ -213,10 +235,10 @@
   \fixme@text{\fixmewarningprefix}{#1}%
   \iffixme@index\FXIndex{\fixmewarningindexname\thefixmewarningcount: #1}\fi%
   \iffixme@silent\else\FXWarning{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmewarningprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmewarningprefix: #1}}
 \def\fixme@warning@final#1{%
   \iffixme@silent\else\FXWarning{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmewarningprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmewarningprefix: #1}}
 
 \newcommand*\fixmeerrorprefix{}
 \newcommand*\fixmeerrorindexname{}
@@ -224,21 +246,22 @@
   \fixme@text{\fixmeerrorprefix}{#1}%
   \iffixme@index\FXIndex{\fixmeerrorindexname\thefixmeerrorcount: #1}\fi%
   \iffixme@silent\else\FXError{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmeerrorprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmeerrorprefix: #1}}
 \def\fixme@error@final#1{%
   \iffixme@silent\else\FXError{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmeerrorprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmeerrorprefix: #1}}
 
 \newcommand*\fixmefatalindexname{}
 \def\fixme@fatal@draft#1{%
   \iffixme@inline\FiXmeInline{#1}\fi%
   \iffixme@margin\FiXmeMargin{#1}\fi%
+  \iffixme@marginclue\FXMarginClue{\fixmefatalprefix}\fi%
   \iffixme@footnote\FiXmeFootnote{#1}\fi%
   \iffixme@user\FiXmeUser{#1}\fi%
   \iffixme@index\FiXmeIndex{%
     \fixmefatalindexname\thefixmefatalcount: #1}\fi%
   \iffixme@silent\else\FXFatal{#1}\fi%
-  \addcontentsline{lox}{fixme}{\fixmefatalprefix: #1}}
+  \addcontentsline{lox}{fixme}{\protect\fixmefatalprefix: #1}}
 \def\fixme@fatal@final#1{%
   \PackageError{FiXme}{`#1' fixme left in final version}{%
     You are processing your document in final mode,\MessageBreak
@@ -253,19 +276,21 @@
   \bgroup%
   \fixme@inlinefalse%
   \fixme@marginfalse%
+  \fixme@margincluefalse%
   \fixme@footnotefalse%
   \fixme@userfalse%
   \fixme@indexfalse%
   \@for\fixme@option:=#2\do{%
     \expandafter\ifx\csname fixme@\fixme@option true\endcsname\relax
       \PackageError{FiXme}{Unknown layout option `\fixme@option'}{%
-        You have given an invalid option to \string\fixme, %
-        or an \string\fx command.\MessageBreak
-        Valid options are `inline', `margin', `footnote' and `index'.%
-        \MessageBreak
+        You have given an invalid option to \string\fixme, or an \string\fx %
+        command.\MessageBreak
+        Valid options are `inline', `margin', `marginclue', `footnote', %
+        `user',\MessageBreak
+        and `index'.\MessageBreak
         Type X to quit, fix your document, and rerun LaTeX.}%
       \else%
-      \csname fixme@\fixme@option true\endcsname%
+      \csname fixme@set\fixme@option\endcsname%
     \fi}%
   \@@fixme{#1}{#3}%
   \egroup}
@@ -283,10 +308,14 @@
 
 \def\@fxenvbegin@draft#1#2{%
   \FXEnvBegin
-  \edef\fixme@args{inline\iffixme@index,index\fi}%
+  \edef\fixme@args{inline%
+    \iffixme@index,index\fi%
+    \iffixme@marginclue,marginclue\fi}%
   \csname#1\endcsname[\fixme@args]{#2}}
 \def\@fxenvbegin@final#1#2{
-  \edef\fixme@args{inline\iffixme@index,index\fi}%
+  \edef\fixme@args{inline%
+    \iffixme@index,index\fi%
+    \iffixme@marginclue,marginclue\fi}%
   \csname#1\endcsname[\fixme@args]{#2}
   \comment
 }
@@ -376,6 +405,17 @@
   \renewcommand*\fixmeerrorindexname{**c@Fejl:!}
   \renewcommand*\fixmefatalindexname{}
   \renewcommand*{\listfixmename}{Rettelser}}
+\DeclareOption{croatian}{%
+  \renewcommand*\fixmenoteprefix{\fixmelogo\nobreakspace Poruka}
+  \renewcommand*\fixmewarningprefix{\fixmelogo\nobreakspace Upozorenje}
+  \renewcommand*\fixmeerrorprefix{\fixmelogo\nobreakspace Gre\v ska}
+  \renewcommand*\fixmefatalprefix{\fixmelogo}
+  \renewcommand*\fixmeindexname{\fixmelogo}
+  \renewcommand*\fixmenoteindexname{**a@Poruke:!}
+  \renewcommand*\fixmewarningindexname{**b@Upozorenja:!}
+  \renewcommand*\fixmeerrorindexname{**c@Greske:!}
+  \renewcommand*\fixmefatalindexname{}
+  \renewcommand*{\listfixmename}{Popis korekcija}}
 
 \DeclareOption{final}{
   \let\fixme@note\fixme@note@final
@@ -388,47 +428,43 @@
   }
 
 \DeclareOption{draft}{
-  \let\fixme@note\fixme@note@draft
-  \let\fixme@warning\fixme@warning@draft
-  \let\fixme@error\fixme@error@draft
-  \let\fixme@fatal\fixme@fatal@draft
-  \let\@fxenvbegin\@fxenvbegin@draft
-  \let\@fxenvend\@fxenvend@draft
-  \let\listoffixmes\listoffixmes@draft
   \@ifclassloaded{article}{
     \let\@listoffixmes@pretoc\@listoffixmes@pretoc@article
-    \let\@listoffixmes@posttoc\@listoffixmes@posttoc@article
-    \let\l@fixme\l@fixme@article}{
+    \let\@listoffixmes@posttoc\@listoffixmes@posttoc@article}{
     \@ifclassloaded{report}{
       \let\@listoffixmes@pretoc\@listoffixmes@pretoc@report
-      \let\@listoffixmes@posttoc\@listoffixmes@posttoc@report
-      \let\l@fixme\l@fixme@report}{
+      \let\@listoffixmes@posttoc\@listoffixmes@posttoc@report}{
       \@ifclassloaded{book}{
         \let\@listoffixmes@pretoc\@listoffixmes@pretoc@book
-        \let\@listoffixmes@posttoc\@listoffixmes@posttoc@book
-        \let\l@fixme\l@fixme@book}{
+        \let\@listoffixmes@posttoc\@listoffixmes@posttoc@book}{
         \@ifclassloaded{scrartcl}{
           \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrartcl
-          \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrartcl
-          \let\l@fixme\l@fixme@scrartcl}{
+          \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrartcl}{
           \@ifclassloaded{scrreprt}{
             \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrreprt
-            \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrreprt
-            \let\l@fixme\l@fixme@scrreprt}{
+            \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrreprt}{
             \@ifclassloaded{scrbook}{
               \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrbook
-              \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrbook
-              \let\l@fixme\l@fixme@scrbook}{
-              %% Use the article layout by default.
-              \let\@listoffixmes@pretoc\@listoffixmes@pretoc@article
-              \let\@listoffixmes@posttoc\@listoffixmes@posttoc@article
-              \let\l@fixme\l@fixme@article}
+              \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrbook}{
+              \@ifclassloaded{amsbook}{
+                \let\listoffixmes@draft\listoffixmes@draft@amsbook}{
+                %% Use the article layout by default.
+                \let\@listoffixmes@pretoc\@listoffixmes@pretoc@article
+                \let\@listoffixmes@posttoc\@listoffixmes@posttoc@article}
             }
           }
         }
       }
     }
   }
+  \let\fixme@note\fixme@note@draft
+  \let\fixme@warning\fixme@warning@draft
+  \let\fixme@error\fixme@error@draft
+  \let\fixme@fatal\fixme@fatal@draft
+  \let\@fxenvbegin\@fxenvbegin@draft
+  \let\@fxenvend\@fxenvend@draft
+  \let\listoffixmes\listoffixmes@draft
+}
 
 \ExecuteOptions{english,final,margin,nosilent}
 \ProcessOptions*
diff --git a/Master/texmf-dist/tpm/fixme.tpm b/Master/texmf-dist/tpm/fixme.tpm
index 00442f411ac..754041277b5 100644
--- a/Master/texmf-dist/tpm/fixme.tpm
+++ b/Master/texmf-dist/tpm/fixme.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/fixme.zip">
     <TPM:Name>fixme</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:53:20</TPM:Date>
+    <TPM:Date>2006/04/14 20:18:20</TPM:Date>
     <TPM:Version>2.1</TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>
@@ -22,17 +22,17 @@ for AUC-TeX.
     <TPM:Author>Didier Verna</TPM:Author>
     <TPM:Size>182776</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="17497">
+    <TPM:RunFiles size="18741">
 texmf-dist/tex/latex/fixme/fixme.sty
 texmf-dist/tpm/fixme.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="122048">
+    <TPM:DocFiles size="103372">
 texmf-dist/doc/latex/fixme/NEWS
 texmf-dist/doc/latex/fixme/README
 texmf-dist/doc/latex/fixme/fixme.el
 texmf-dist/doc/latex/fixme/fixme.pdf
     </TPM:DocFiles>
-    <TPM:SourceFiles size="43231">
+    <TPM:SourceFiles size="46347">
 texmf-dist/source/latex/fixme/fixme.dtx
 texmf-dist/source/latex/fixme/fixme.ins
     </TPM:SourceFiles>