fixme 4.2 (28jan13)

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

26 files changed, 132 insertions, 181 deletions

diff --git a/Master/texmf-dist/doc/latex/fixme/NEWS b/Master/texmf-dist/doc/latex/fixme/NEWS
index f754fe939e8..b0c4a334d26 100644
--- a/Master/texmf-dist/doc/latex/fixme/NEWS
+++ b/Master/texmf-dist/doc/latex/fixme/NEWS
@@ -1,9 +1,7 @@
-
 			     WHAT'S NEW IN FIXME
 
 
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-Copyright (C) 2007, 2009 Didier Verna
+Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 This file is part of FiXme.
 
@@ -17,17 +15,20 @@ version 1999/06/01 or later.
 
 FiXme consists of the files listed in the file `README'.
 
+* Version 4.2
+** Improve Danish translation
+thanks to Lars Madsen.
+** Fix buglet in redefinition of \@wrindex
+reported by Norman Gray.
 
 * Version 4.1
-=============
 ** 8 new PDF-specific annotation layouts.
 ** New annotation layout: marginnote
-suggested by Sébastien Mengin.
+suggested by Sébastien Mengin.
 ** Better mechanism for handling layout mutual exclusion.
 ** Fix bug in inner layout processing.
 
 * Version 4.0
-=============
 ** Support for collaborative annotations
 suggested by Michael Kubovy.
 ** Support for "targeted" notes and environments
@@ -45,14 +46,12 @@ suggested by Will Robertson.
 ** Heavy internals refactoring.
 
 * Version 3.4
-=============
 ** \fixme, \fxerror, \fxwarning and \fxnote are now robust
 thanks to Will Robertson.
 ** Fix incompatibility with KOMA-Script classes
 when the lox file is inexistent, reported by Philipp Stephani.
 
 * Version 3.3
-=============
 ** Document incompatibility between marginal layout and the ACM SIG classes
 reported by Jochen Wuttke.
 ** Honor twoside option in marginal layout
@@ -67,23 +66,20 @@ reported by Lars Madsen: \@starttoc takes 2 arguments.
 reported by Stefan Mann: a typo in the macro name.
 
 * Version 3.2
-=============
 ** Added the marginclue layout option
 which only signals a fixme in the margin, withtout the actual contents.
 ** Support for Croatian
-thanks to Marcel Maretic <marcel@fsb.hr>.
+thanks to Marcel Maretic.
 ** Fix incompatibility with AMS-Book
-reported by Claude Lacoursière: \@starttoc takes 2 arguments.
+reported by Claude Lacoursière: \@starttoc takes 2 arguments.
 ** Fix incompatibility with Beamer
 reported by Akim Demaille: protect contents of lox file in environments.
 
 * Version 3.1
-=============
 ** Fix bug in environments
 reported by Arnold Beckmann: they were visible in final mode.
 
 * Version 3.0
-=============
 ** Added fixme environments
 providing similar functionalities as already existing macros.
 ** Added an optional first argument to the note insertion commands
@@ -93,13 +89,11 @@ reported by Akim Demaille: they could mess up the document's layout by
 flushing it right.
 
 * Version 2.2
-=============
 ** New option "silent" to suppress notes logging.
 ** Support for Danish
-thanks to Kim Rud Bille <krbi01@control.auc.dk>.
+thanks to Kim Rud Bille.
 
 * Version 2.1
-=============
 ** Use \nobreakspace instead of the tilda character:
 this avoids conflicts with Babel and Spanish environments.
 ** Fix bug in index handling
@@ -107,34 +101,29 @@ reported by Knut Lickert: index entries were
 unconditionally built.
 
 * Version 2.0
-=============
 ** New feature: note levels.
 ** New feature: note counters, FiXme usage summary.
 ** Suggestions from Kasper B. Graversen.
 ** Support for Spanish
-thanks to Augustín Martín <agusmba@terra.es>.
+thanks to Augustín Martín.
 
 * Version 1.5
-=============
 ** New `inline' layout option:
 puts notes directly in the text.
 
 * Version 1.4
-=============
 ** Support for the koma-script classes.
 ** Fix bug in \listoffixmes
 reported by Ulf Jaenicke-Roessler: the command didn't work when called before
 the first fixme note.
 
 * Version 1.3
-=============
 ** Support for Italian
-thanks to Riccardo Murri <murri@phc.unipi.it>.
+thanks to Riccardo Murri.
 
 * Version 1.2
-=============
 ** Support for German
-thanks to Harald Harders <h.harders@tu-bs.de>.
+thanks to Harald Harders.
 
 
 
diff --git a/Master/texmf-dist/doc/latex/fixme/README b/Master/texmf-dist/doc/latex/fixme/README
index 1faff13b466..9643e7cdc3a 100644
--- a/Master/texmf-dist/doc/latex/fixme/README
+++ b/Master/texmf-dist/doc/latex/fixme/README
@@ -1,9 +1,7 @@
-
 				 ABOUT FIXME
 
 
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-Copyright (C) 2007, 2009 Didier Verna
+Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 This file is part of FiXme.
 
@@ -26,7 +24,6 @@ FiXme consists of the following files:
 
 
 * Description
-=============
 
 FiXme is a collaborative annotation tool for LaTeX documents. Annotating a
 document refers here to inserting meta-notes, that is, notes that do not
@@ -48,23 +45,22 @@ FiXme homepage: http://www.lrde.epita.fr/~didier/software/latex.php#fixme
 
 
 * Installation
-==============
 
 If you are building FiXme from the tarball you need to execute the following
 steps in order to extract the necessary files. FiXme also requires the DoX
 package (version 2.0, release date 2009/09/21 or later), to build. It is not
 required to use the paclage.
 
-[pdf]latex fixme.ins 
-[pdf]latex fixme.dtx 
-[pdf]latex fixme.dtx 
-makeindex -s gind fixme.idx 
-[pdf]latex fixme.dtx 
-[pdf]latex fixme.dtx 
+[pdf]latex fixme.ins
+[pdf]latex fixme.dtx
+[pdf]latex fixme.dtx
+makeindex -s gind fixme.idx
+[pdf]latex fixme.dtx
+[pdf]latex fixme.dtx
 
 After that, you need to install the generated documentation and style files to
 a location where LATEX can find them. For a TDS-compliant layout, the
-following locations are suggested: 
+following locations are suggested:
 
 [TEXMF]/tex/latex/fixme/fixme.sty
 [TEXMF]/tex/latex/fixme/layouts/fxlayout*.sty
@@ -77,15 +73,6 @@ If you're an AUC-TeX user, you may also install the file 'fixme.el' in a
 suitable AUC-TeX style directory.
 
 
-	Have fun!
-
---
-Didier Verna <didier@lrde.epita.fr>
-
-Sientific site:    http://www.lrde.epita.fr/~didier
-Music (Jazz) site: http://www.didierverna.com
-
-
 
 
 Local Variables:
diff --git a/Master/texmf-dist/doc/latex/fixme/THANKS b/Master/texmf-dist/doc/latex/fixme/THANKS
index 1e4e3b2c3b0..7ef1a57ee60 100644
--- a/Master/texmf-dist/doc/latex/fixme/THANKS
+++ b/Master/texmf-dist/doc/latex/fixme/THANKS
@@ -1,8 +1,7 @@
-
 				 THANK YOU!
 
 
-Copyright (C) 2007, 2009 Didier Verna
+Copyright (C) 2007, 2009, 2013 Didier Verna
 
 This file is part of FiXme.
 
@@ -20,13 +19,14 @@ FiXme consists of the files listed in the file `README'.
 * Contributors
 
 ** The following persons have contributed code, bug reports, localization,
-** suggestions etc:
-
-Sébastien Mengin, Michael Kubovy, Mark Edgington, Rasmus Villemoes, Philipp
-Stephani, Will Robertson, Jochen Wuttke, Jens Remus, Brian van den Broek, Lars
-Madsen, Stefan Mann, Marcel Maretic, Claude Lacoursière, Arnold Beckmann, Akim
-Demaille, Kim Rud Bille, Knut Lickert, Kasper B. Graversen, Augustín Martín,
-Ulf Jaenicke-Roessler, Riccardo Murri, Harald Harders.
+** suggestions etc.:
+
+Norman Gray, Sébastien Mengin, Michael Kubovy, Mark Edgington, Rasmus
+Villemoes, Philipp Stephani, Will Robertson, Jochen Wuttke, Jens Remus, Brian
+van den Broek, Lars Madsen, Stefan Mann, Marcel Maretic, Claude Lacoursière,
+Arnold Beckmann, Akim Demaille, Kim Rud Bille, Knut Lickert, Kasper B.
+Graversen, Augustín Martín, Ulf Jaenicke-Roessler, Riccardo Murri, Harald
+Harders.
 
 
 
diff --git a/Master/texmf-dist/doc/latex/fixme/fixme.el b/Master/texmf-dist/doc/latex/fixme/fixme.el
index 83692f111e5..056e0f469cc 100644
--- a/Master/texmf-dist/doc/latex/fixme/fixme.el
+++ b/Master/texmf-dist/doc/latex/fixme/fixme.el
@@ -1,12 +1,10 @@
 ;;; fixme.el --- AUC-TeX style file for FiXme
 
-;; Copyright (C) 2000, 2002, 2004, 2006, 2009 Didier Verna.
+;; Copyright (C) 2000, 2002, 2004, 2006, 2009 Didier Verna
 
-;; Author:        Didier Verna <didier@lrde.epita.fr>
-;; Maintainer:    Didier Verna <didier@lrde.epita.fr>
-;; Created:       Tue Apr 18 14:49:29 2000
-;; Last Revision: Sat Sep 19 14:19:30 2009
-;; Keywords:      tex abbrev data
+;; Author: Didier Verna <didier@didierverna.net>
+;; Created: Tue Apr 18 14:49:29 2000
+;; Keywords: tex abbrev data
 
 
 ;; This file is part of FiXme.
diff --git a/Master/texmf-dist/doc/latex/fixme/fixme.pdf b/Master/texmf-dist/doc/latex/fixme/fixme.pdf
index 2047a5d0ad8..1eec9e59405 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/doc/latex/fixme/header.inc b/Master/texmf-dist/doc/latex/fixme/header.inc
index 5d8f62709a0..003175f335c 100644
--- a/Master/texmf-dist/doc/latex/fixme/header.inc
+++ b/Master/texmf-dist/doc/latex/fixme/header.inc
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
@@ -38,7 +37,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesPackage{fixme}[2009/09/30 v4.1 Insert fixme notes in your documents]
+\ProvidesPackage{fixme}[2013/01/28 v4.2 Collaborative annotations for LaTeX2e]
 
 \newcommand\fixmelogo{\textsf{FiXme}}
 
diff --git a/Master/texmf-dist/source/latex/fixme/fixme.dtx b/Master/texmf-dist/source/latex/fixme/fixme.dtx
index 6b81d18c64b..57fd476bf3b 100644
--- a/Master/texmf-dist/source/latex/fixme/fixme.dtx
+++ b/Master/texmf-dist/source/latex/fixme/fixme.dtx
@@ -1,14 +1,11 @@
 % \iffalse
 %
-% fixme.dtx --- Doc file for the FiXme package (code and documentation)
+% fixme.dtx --- docTeX file for FiXme
 %
-% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna.
-% Copyright (C) 2007, 2009 Didier Verna.
+% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 %
-% Author:        Didier Verna <didier@lrde.epita.fr>
-% Maintainer:    Didier Verna <didier@lrde.epita.fr>
-% Created:       Thu Dec 10 16:04:01 1998
-% Last Revision: Wed Sep 30 18:01:02 2009
+% Author: Didier Verna <didier@didierverna.net>
+% Created: Thu Dec 10 16:04:01 1998
 %
 % This file is part of FiXme.
 %
@@ -70,7 +67,7 @@
 % \fi
 %
 % \catcode`\¡=14
-% \CheckSum{1833}
+% \CheckSum{1831}
 % \GetFileInfo{fixme.inc}
 %% \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
@@ -129,7 +126,7 @@
 %
 % \newcommand\fx{\fixmelogo\xspace}
 % \newcommand\packagecopyright{%
-%   Copyright \copyright{} 1998--2002, 2004--2007, 2009 Didier Verna}
+%   Copyright \copyright{} 1998--2002, 2004--2007, 2009, 2013 Didier Verna}
 %
 % \pagestyle{mystyle}
 % \newcommand\fxmarkright{%
@@ -141,7 +138,7 @@
 %     \fx homepage: %
 %     \texttt{http://www.lrde.epita.fr/\~{}didier/software/latex.php\#fixme}}}
 % \author{Didier Verna\\
-%   \texttt{mailto:didier@lrde.epita.fr}\\
+%   \texttt{mailto:didier@didierverna.net}\\
 %   \texttt{http://www.lrde.epita.fr/\~{}didier/}}
 % \maketitle
 %
@@ -1488,8 +1485,11 @@
 %
 % \section{History\label{sec:manual:history}}
 % \begin{itemize}
+% \item[v4.2] Improve Danish translation, thanks to Lars Madsen.\\
+%   Fix buglet in \cs{@wrindex} redefinition, reported by Norman
+%   Gray.\\
 % \item[v4.1] 8 new PDF-specific annotation layouts.\\
-%   New annotation layout: \texttt{marginnote}, suggested by Sébastien
+%   New annotation layout: \texttt{marginnote}, suggested by S\'ebastien
 %   Mengin.\\
 %   Better mechanism for handling layout mutual exclusion.\\
 %   Fix bug in inner layout processing.
@@ -1526,7 +1526,7 @@
 %   macro name.
 % \item[v3.2] Added the marginclue layout option which only signals a fixme in
 %   the margin, withtout the actual contents.\\
-%   Support for Croatian thanks to Marcel Maretic |<marcel@fsb.hr>|.\\
+%   Support for Croatian thanks to Marcel Maretic.\\
 %   Fix incompatibility with \texttt{amsbook} reported by Claude
 %   Lacoursi\`ere: \cs{@starttoc} takes two arguments.\\
 %   Fix incompatibility with Beamer reported by Akim Demaille: protect
@@ -1540,22 +1540,21 @@
 %   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 \cs{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.
+%   Support for Danish thanks to Kim Rud Bille.
+% \item[v2.1] Use \cs{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: \fx 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>|
+%   Suggestions from Kasper B. Graversen.\\
+%   Support for Spanish thanks to Agust\'in Mart\'in.
 % \item[v1.5] New appearance option: \texttt{inline}.
 % \item[v1.4] Support for the \komascript classes.\\
 %   Fix bug reported by Ulf Jaenicke-Roessler: the \cs{listoffixmes} command
 %   didn't work when called before the first \fx 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.3] Support for Italian thanks to Riccardo Murri.
+% \item[v1.2] Support for German thanks to Harald Harders.
 % \end{itemize}
 %
 % \StopEventually{\vfill\hfill\small \packagecopyright{}.}
@@ -1565,7 +1564,7 @@
 %    \begin{macrocode}
 %<fixme>\NeedsTeXFormat{LaTeX2e}
 %<*header>
-\ProvidesPackage{fixme}[2009/09/30 v4.1 Insert fixme notes in your documents]
+\ProvidesPackage{fixme}[2013/01/28 v4.2 Collaborative annotations for LaTeX2e]
 
 %</header>
 %    \end{macrocode}
@@ -1733,8 +1732,8 @@
      \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
      {#4}\nobreak
      \leaders\hbox{$\m@th
-	\mkern \@dotsep mu\hbox{.}\mkern \@dotsep
-	mu$}\hfill
+       \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+       mu$}\hfill
      \nobreak
      #5\par}%
   \fi}
@@ -2175,7 +2174,7 @@
 \def\@wrindex#1{%
   \ifthenelse{\equal{\cmdfx@note@target}{thepage}}{%
     \protected@write\@indexfile{}{\string\indexentry{#1}{\thepage}}}{%
-    \protected@write\@indexfile{}{\string\indexentry{#1}{\cmdfx@note@target}}}
+    \protected@write\@indexfile{}{\string\indexentry{#1}{\cmdfx@note@target}}}%
   \endgroup
   \@esphack}
 %    \end{macrocode}
@@ -2701,12 +2700,12 @@
   \ifinner%
     \ifthenelse{\boolean{fx@layout@margin}}{%
       \@fxpkginfo{%
-	inner mode detected;\MessageBreak
-	turning margin layout form off}}{%
+        inner mode detected;\MessageBreak
+        turning margin layout form off}}{%
       \ifthenelse{\boolean{fx@layout@marginclue}}{%
-	\@fxpkginfo{%
-	  inner mode detected;\MessageBreak
-	  turning marginclue layout form off}}{}}%
+        \@fxpkginfo{%
+          inner mode detected;\MessageBreak
+          turning marginclue layout form off}}{}}%
     \expandafter\@fxsetlayoutkeys\expandafter{%
       \cmdfx@layout@innerlayout,nomargin,nomarginclue}%
   \fi}
@@ -3335,8 +3334,8 @@
 \newcommand\fxdanishwarningsname{Advarsler}
 \newcommand\fxdanisherrorname{Fejl}
 \newcommand\fxdanisherrorsname{Fejl}
-\newcommand\fxdanishfatalname{D\o delige}
-\newcommand\fxdanishfatalsname{Sk\ae bnesvangre fejl}
+\newcommand\fxdanishfatalname{Fatal}
+\newcommand\fxdanishfatalsname{Fatale fejl}
 \newcommand\danishlistfixmename{Rettelser}
 
 %    \end{macrocode}
@@ -3558,21 +3557,21 @@
       \let\@lox@prtc\@lox@prtc@book%
       \let\@lox@psttc\@lox@psttc@book}{%
       \@ifclassloaded{scrartcl}{%
-	\let\@lox@prtc\@lox@prtc@scrartcl%
-	\let\@lox@psttc\@lox@psttc@scrartcl}{%
-	\@ifclassloaded{scrreprt}{%
-	  \let\@lox@prtc\@lox@prtc@scrreprt%
-	  \let\@lox@psttc\@lox@psttc@scrreprt}{%
-	  \@ifclassloaded{scrbook}{%
-	    \let\@lox@prtc\@lox@prtc@scrbook%
-	    \let\@lox@psttc\@lox@psttc@scrbook}{%
-	    \@ifclassloaded{amsbook}{%
-	      \let\lox@draft\lox@draft@ams}{%
-	      \@ifclassloaded{amsart}{%
-		\let\lox@draft\lox@draft@ams}{%
-		%% Use the article layout by default.
-		\let\@lox@prtc\@lox@prtc@article%
-		\let\@lox@psttc\@lox@psttc@article}}}}}}}}
+        \let\@lox@prtc\@lox@prtc@scrartcl%
+        \let\@lox@psttc\@lox@psttc@scrartcl}{%
+        \@ifclassloaded{scrreprt}{%
+          \let\@lox@prtc\@lox@prtc@scrreprt%
+          \let\@lox@psttc\@lox@psttc@scrreprt}{%
+          \@ifclassloaded{scrbook}{%
+            \let\@lox@prtc\@lox@prtc@scrbook%
+            \let\@lox@psttc\@lox@psttc@scrbook}{%
+            \@ifclassloaded{amsbook}{%
+              \let\lox@draft\lox@draft@ams}{%
+              \@ifclassloaded{amsart}{%
+                \let\lox@draft\lox@draft@ams}{%
+                %% Use the article layout by default.
+                \let\@lox@prtc\@lox@prtc@article%
+                \let\@lox@psttc\@lox@psttc@article}}}}}}}}
 
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/fixme/fixme.ins b/Master/texmf-dist/source/latex/fixme/fixme.ins
index c547a5f4eae..6b28ff065d8 100644
--- a/Master/texmf-dist/source/latex/fixme/fixme.ins
+++ b/Master/texmf-dist/source/latex/fixme/fixme.ins
@@ -1,11 +1,9 @@
-%%% fixme.ins --- Installation file for FiXme              -*- mode: LaTeX -*-
+%%% fixme.ins --- Installation file for FiXme
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2007, 2009 Didier Verna.
+%% Copyright (C) 1998-2002, 2004, 2007, 2009, 2013 Didier Verna
 
-%% Author:        Didier Verna <didier@lrde.epita.fr>
-%% Maintainer:    Didier Verna <didier@lrde.epita.fr>
-%% Created:       Thu Dec 10 16:04:01 1998
-%% Last Revision: Wed Sep 30 18:01:18 2009
+%% Author: Didier Verna <didier@didierverna.net>
+%% Created: Thu Dec 10 16:04:01 1998
 
 %% This file is part of FiXme.
 
@@ -35,8 +33,7 @@
 
 \preamble
 ^^J^^J
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-Copyright (C) 2007, 2009 Didier Verna^^J
+Copyright (C) 1998-2002, 2004-2007, 2009, 2013 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 b599ed3a753..71e735cc333 100644
--- a/Master/texmf-dist/tex/latex/fixme/fixme.sty
+++ b/Master/texmf-dist/tex/latex/fixme/fixme.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
@@ -39,7 +38,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fixme}[2009/09/30 v4.1 Insert fixme notes in your documents]
+\ProvidesPackage{fixme}[2013/01/28 v4.2 Collaborative annotations for LaTeX2e]
 
 \RequirePackage{ifthen}
 \RequirePackage{verbatim}
@@ -98,8 +97,8 @@
      \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
      {#4}\nobreak
      \leaders\hbox{$\m@th
-\mkern \@dotsep mu\hbox{.}\mkern \@dotsep
-mu$}\hfill
+       \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+       mu$}\hfill
      \nobreak
      #5\par}%
   \fi}
@@ -260,7 +259,7 @@ mu$}\hfill
 \def\@wrindex#1{%
   \ifthenelse{\equal{\cmdfx@note@target}{thepage}}{%
     \protected@write\@indexfile{}{\string\indexentry{#1}{\thepage}}}{%
-    \protected@write\@indexfile{}{\string\indexentry{#1}{\cmdfx@note@target}}}
+    \protected@write\@indexfile{}{\string\indexentry{#1}{\cmdfx@note@target}}}%
   \endgroup
   \@esphack}
 \newcommand\@fxnotekey{***a}
@@ -426,12 +425,12 @@ mu$}\hfill
   \ifinner%
     \ifthenelse{\boolean{fx@layout@margin}}{%
       \@fxpkginfo{%
-inner mode detected;\MessageBreak
-turning margin layout form off}}{%
+        inner mode detected;\MessageBreak
+        turning margin layout form off}}{%
       \ifthenelse{\boolean{fx@layout@marginclue}}{%
-\@fxpkginfo{%
-  inner mode detected;\MessageBreak
-  turning marginclue layout form off}}{}}%
+        \@fxpkginfo{%
+          inner mode detected;\MessageBreak
+          turning marginclue layout form off}}{}}%
     \expandafter\@fxsetlayoutkeys\expandafter{%
       \cmdfx@layout@innerlayout,nomargin,nomarginclue}%
   \fi}
@@ -647,8 +646,8 @@ turning margin layout form off}}{%
 \newcommand\fxdanishwarningsname{Advarsler}
 \newcommand\fxdanisherrorname{Fejl}
 \newcommand\fxdanisherrorsname{Fejl}
-\newcommand\fxdanishfatalname{D\o delige}
-\newcommand\fxdanishfatalsname{Sk\ae bnesvangre fejl}
+\newcommand\fxdanishfatalname{Fatal}
+\newcommand\fxdanishfatalsname{Fatale fejl}
 \newcommand\danishlistfixmename{Rettelser}
 
 \newcommand\fxcroatiannotename{Poruka}
@@ -709,21 +708,21 @@ turning margin layout form off}}{%
       \let\@lox@prtc\@lox@prtc@book%
       \let\@lox@psttc\@lox@psttc@book}{%
       \@ifclassloaded{scrartcl}{%
-\let\@lox@prtc\@lox@prtc@scrartcl%
-\let\@lox@psttc\@lox@psttc@scrartcl}{%
-\@ifclassloaded{scrreprt}{%
-  \let\@lox@prtc\@lox@prtc@scrreprt%
-  \let\@lox@psttc\@lox@psttc@scrreprt}{%
-  \@ifclassloaded{scrbook}{%
-    \let\@lox@prtc\@lox@prtc@scrbook%
-    \let\@lox@psttc\@lox@psttc@scrbook}{%
-    \@ifclassloaded{amsbook}{%
-      \let\lox@draft\lox@draft@ams}{%
-      \@ifclassloaded{amsart}{%
-\let\lox@draft\lox@draft@ams}{%
-%% Use the article layout by default.
-\let\@lox@prtc\@lox@prtc@article%
-\let\@lox@psttc\@lox@psttc@article}}}}}}}}
+        \let\@lox@prtc\@lox@prtc@scrartcl%
+        \let\@lox@psttc\@lox@psttc@scrartcl}{%
+        \@ifclassloaded{scrreprt}{%
+          \let\@lox@prtc\@lox@prtc@scrreprt%
+          \let\@lox@psttc\@lox@psttc@scrreprt}{%
+          \@ifclassloaded{scrbook}{%
+            \let\@lox@prtc\@lox@prtc@scrbook%
+            \let\@lox@psttc\@lox@psttc@scrbook}{%
+            \@ifclassloaded{amsbook}{%
+              \let\lox@draft\lox@draft@ams}{%
+              \@ifclassloaded{amsart}{%
+                \let\lox@draft\lox@draft@ams}{%
+                %% Use the article layout by default.
+                \let\@lox@prtc\@lox@prtc@article%
+                \let\@lox@psttc\@lox@psttc@article}}}}}}}}
 
 \ExecuteOptionsX[fx]<%
   mode,status,lang,log,note,face,layout,envlayout,targetlayout>{%
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty b/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty
index 02306131207..e79e0a96528 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty b/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty
index 545385a88e5..96b49931a6d 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
index b254e194e5b..d0e6451aad5 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty
index cee6be30b85..eabaf2db2c7 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
index d7447372288..f8ecdd0cb9a 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
index ea1de7069d5..43932184bd2 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
index 7b5fcad775e..416547f133e 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty
index 1c6cb582e81..5b51fe6f7d4 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty
index 0965f7046fd..d8d36191b1b 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty
index 5eb5e1a6983..c43a62fa935 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty
index a19792f7745..846a3a127d5 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty
index 3f54639ddb7..fee672bf19f 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty
index c8531531c90..3e3db415df6 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty
index 0eb4ebd2528..feabe0406ac 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
index fe10dda83b0..416f1b39d39 100644
--- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
+++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty
index bb11100f0e5..db231ced3f9 100644
--- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty
+++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.
 
diff --git a/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty b/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty
index a3255ca2e68..bc769c1a726 100644
--- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty
+++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty
@@ -8,8 +8,7 @@
 %% 
 
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-%% Copyright (C) 2007, 2009 Didier Verna
+%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013 Didier Verna
 
 %% This file is part of FiXme.