fixme 4.2 (28jan13)

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

2 files changed, 52 insertions, 56 deletions

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