fixme 3.4 (22jul09)

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

6 files changed, 50 insertions, 37 deletions

diff --git a/Master/texmf-dist/doc/latex/fixme/NEWS b/Master/texmf-dist/doc/latex/fixme/NEWS
index 096dba15b34..7138b341703 100644
--- a/Master/texmf-dist/doc/latex/fixme/NEWS
+++ b/Master/texmf-dist/doc/latex/fixme/NEWS
@@ -3,7 +3,7 @@
 
 
 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-Copyright (C) 2007 Didier Verna
+Copyright (C) 2007, 2009 Didier Verna
 
 This file is part of FiXme.
 
@@ -18,10 +18,17 @@ version 1999/06/01 or later.
 FiXme consists of the files listed in the file `README'.
 
 
+* 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
+reported by Jochen Wuttke.
 ** Honor twoside option in marginal layout
 suggested by Jens Remus.
 ** Support KOMA-Script classes version 2006/07/30 v2.95b
diff --git a/Master/texmf-dist/doc/latex/fixme/THANKS b/Master/texmf-dist/doc/latex/fixme/THANKS
index ff9eb6d4bb7..eb09c4d4326 100644
--- a/Master/texmf-dist/doc/latex/fixme/THANKS
+++ b/Master/texmf-dist/doc/latex/fixme/THANKS
@@ -2,7 +2,7 @@
 				 THANK YOU!
 
 
-Copyright (C) 2007 Didier Verna
+Copyright (C) 2007, 2009 Didier Verna
 
 This file is part of FiXme.
 
@@ -22,10 +22,10 @@ FiXme consists of the files listed in the file `README'.
 ** The following persons have contributed code, bug reports, localization,
 ** suggestions etc:
 
-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.
+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.pdf b/Master/texmf-dist/doc/latex/fixme/fixme.pdf
index 90f53459c54..6e825533783 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 d14deca14f1..86600985d1c 100644
--- a/Master/texmf-dist/source/latex/fixme/fixme.dtx
+++ b/Master/texmf-dist/source/latex/fixme/fixme.dtx
@@ -3,12 +3,12 @@
 % fixme.dtx --- Doc file for the FiXme package (code and documentation)
 %
 % Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna.
-% Copyright (C) 2007 Didier Verna.
+% Copyright (C) 2007, 2009 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 Nov 14 17:52:06 2007
+% Last Revision: Thu Jul 16 19:55:00 2009
 %
 % This file is part of FiXme.
 %
@@ -43,7 +43,7 @@
 % \fi
 %
 % \catcode`\ˇ=14
-% \CheckSum{881}
+% \CheckSum{880}
 %% \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
@@ -60,9 +60,10 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 %
-% \newcommand\version{3.3}
-% \newcommand\releasedate{2007/11/28}
-% \newcommand\packagecopyright{Copyright \copyright{} 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Didier Verna}
+% \newcommand\version{3.4}
+% \newcommand\releasedate{2009/07/16}
+% \newcommand\packagecopyright{Copyright \copyright{} 1998, 1999, 2000, 2001,
+%   2002, 2004, 2005, 2006, 2007, 2009 Didier Verna}
 % \newcommand\fixme{\textsf{FiXme}}
 % \newcommand\auctex{AUC-\TeX}
 % \MakeShortVerb{\|}
@@ -372,6 +373,10 @@
 %
 % \section{Changes}
 % \begin{itemize}
+% \item[v3.4] |\fixme|, |\fxerror|, |\fxwarning| and |\fxnote| are now robust,
+%   thanks to Will Robertson.\\
+%   Fix incompatibility with KOMA-Script classes version of |\@starttoc| when
+%   the lox file is inexistent, reported by Philipp Stephani.
 % \item[v3.3] Document incompatibility between marginal layout and the ACM
 %   SIG classes, reported by Jochen Wuttke.\\
 %   Honor \texttt{twoside} option in marginal layout, suggested by Jens
@@ -426,7 +431,7 @@
 % \end{macro}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fixme}[2007/11/28 v3.3
+\ProvidesPackage{fixme}[2009/07/16 v3.4
 			Insert fixme notes in your documents]
 
 \RequirePackage{ifthen}
@@ -460,10 +465,11 @@
 \newcommand\listoffixmes{}
 \def\listoffixmes@final{}
 \def\listoffixmes@draft{%
-  \IfFileExists{\jobname .lox}{\@listoffixmes@pretoc}{}%
-  \@starttoc{lox}%
-  \IfFileExists{\jobname .lox}{\@listoffixmes@posttoc}{}%
-  }
+  \IfFileExists{\jobname .lox}{%
+    \@listoffixmes@pretoc%
+    \@starttoc{lox}%
+    \@listoffixmes@posttoc}{%
+    \@starttoc{lox}}}
 
 %    \end{macrocode}
 % The \texttt{amsbook} and \texttt{amsart} classes have the very ugly idea of
@@ -930,13 +936,13 @@
     \fi}%
   \@@fixme{#1}{#3}%
   \egroup}
-\newcommand\fxnote{\@ifnextchar[%]
+\DeclareRobustCommand\fxnote{\@ifnextchar[%]
   {\@fixme{note}}{\@@fixme{note}}}
-\newcommand\fxwarning{\@ifnextchar[%]
+\DeclareRobustCommand\fxwarning{\@ifnextchar[%]
   {\@fixme{warning}}{\@@fixme{warning}}}
-\newcommand\fxerror{\@ifnextchar[%]
+\DeclareRobustCommand\fxerror{\@ifnextchar[%]
   {\@fixme{error}}{\@@fixme{error}}}
-\newcommand\fixme{\@ifnextchar[%]
+\DeclareRobustCommand\fixme{\@ifnextchar[%]
   {\@fixme{fatal}}{\@@fixme{fatal}}}
 
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/fixme/fixme.ins b/Master/texmf-dist/source/latex/fixme/fixme.ins
index d8b6eb313f2..1cf3bc8dc19 100644
--- a/Master/texmf-dist/source/latex/fixme/fixme.ins
+++ b/Master/texmf-dist/source/latex/fixme/fixme.ins
@@ -1,11 +1,11 @@
 %%% fixme.ins --- Installation file for FiXme              -*- mode: LaTeX -*-
 
-%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 2007 Didier Verna.
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2007, 2009 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 Nov 14 17:50:27 2007
+%% Last Revision: Thu Jul 16 19:56:34 2009
 
 %% This file is part of FiXme.
 
@@ -33,8 +33,8 @@
 
 \preamble
 ^^J^^J
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna^^J
-Copyright (C) 2007 Didier Verna^^J
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+Copyright (C) 2007, 2009 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 d09fd50b00c..3b1f4677662 100644
--- a/Master/texmf-dist/tex/latex/fixme/fixme.sty
+++ b/Master/texmf-dist/tex/latex/fixme/fixme.sty
@@ -9,8 +9,7 @@
 
 
 %% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
-
-%% Copyright (C) 2007 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
 
 %% This file is part of FiXme.
 
@@ -40,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fixme}[2007/11/28 v3.3
+\ProvidesPackage{fixme}[2009/07/16 v3.4
 Insert fixme notes in your documents]
 
 \RequirePackage{ifthen}
@@ -52,10 +51,11 @@ Insert fixme notes in your documents]
 \newcommand\listoffixmes{}
 \def\listoffixmes@final{}
 \def\listoffixmes@draft{%
-  \IfFileExists{\jobname .lox}{\@listoffixmes@pretoc}{}%
-  \@starttoc{lox}%
-  \IfFileExists{\jobname .lox}{\@listoffixmes@posttoc}{}%
-  }
+  \IfFileExists{\jobname .lox}{%
+    \@listoffixmes@pretoc%
+    \@starttoc{lox}%
+    \@listoffixmes@posttoc}{%
+    \@starttoc{lox}}}
 
 \def\listoffixmes@draft@ams{\@starttoc{lox}\listfixmename}
 
@@ -310,13 +310,13 @@ Type X to quit, fix your document, and rerun LaTeX.}%
     \fi}%
   \@@fixme{#1}{#3}%
   \egroup}
-\newcommand\fxnote{\@ifnextchar[%]
+\DeclareRobustCommand\fxnote{\@ifnextchar[%]
   {\@fixme{note}}{\@@fixme{note}}}
-\newcommand\fxwarning{\@ifnextchar[%]
+\DeclareRobustCommand\fxwarning{\@ifnextchar[%]
   {\@fixme{warning}}{\@@fixme{warning}}}
-\newcommand\fxerror{\@ifnextchar[%]
+\DeclareRobustCommand\fxerror{\@ifnextchar[%]
   {\@fixme{error}}{\@@fixme{error}}}
-\newcommand\fixme{\@ifnextchar[%]
+\DeclareRobustCommand\fixme{\@ifnextchar[%]
   {\@fixme{fatal}}{\@@fixme{fatal}}}
 
 \newcommand\FXEnvBegin{\begin{quotation}}