fixme update from ctan

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

1 files changed, 73 insertions, 54 deletions

diff --git a/Master/texmf-dist/tex/latex/fixme/fixme.sty b/Master/texmf-dist/tex/latex/fixme/fixme.sty
index b7e5339432a..d09fd50b00c 100644
--- a/Master/texmf-dist/tex/latex/fixme/fixme.sty
+++ b/Master/texmf-dist/tex/latex/fixme/fixme.sty
@@ -10,6 +10,8 @@
 
 %% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
 
+%% Copyright (C) 2007 Didier Verna
+
 %% This file is part of FiXme.
 
 %% FiXme may be distributed and/or modified under the
@@ -38,9 +40,8 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-
-\ProvidesPackage{fixme}[2006/04/12 v3.2
-                        Insert fixme notes in your documents]
+\ProvidesPackage{fixme}[2007/11/28 v3.3
+Insert fixme notes in your documents]
 
 \RequirePackage{ifthen}
 \RequirePackage{verbatim}
@@ -56,7 +57,7 @@
   \IfFileExists{\jobname .lox}{\@listoffixmes@posttoc}{}%
   }
 
-\def\listoffixmes@draft@amsbook{\@starttoc{lox}\listfixmename}
+\def\listoffixmes@draft@ams{\@starttoc{lox}\listfixmename}
 
 \newcommand*\listfixmename{}
 
@@ -88,40 +89,55 @@
   }
 \def\@listoffixmes@posttoc@book{\if@restonecol\twocolumn\fi}
 
+\newcommand*\lox@heading{\float@listhead{\listfixmename}}
+
 \def\@listoffixmes@pretoc@scrartcl{%
-  \section*{\listfixmename%
-    \@mkboth{\listfixmename}{\listfixmename}}%
+  \begingroup%
+    \lox@heading%
+    \setparsizes{0}{0}{\z@\@plus 1fil}\par@updaterelative
+  }
+\def\@listoffixmes@posttoc@scrartcl{%
+  \endgroup
   }
-\def\@listoffixmes@posttoc@scrartcl{}
 
 \def\@listoffixmes@pretoc@scrreprt{%
-  \if@twocolumn
-    \@restonecoltrue\onecolumn
-  \else
-    \@restonecolfalse
-  \fi
-  \chapter*{\listfixmename%
-    \@mkboth{\listfixmename}{\listfixmename}}%
+  \begingroup%
+    \if@twocolumn
+      \@restonecoltrue\onecolumn
+    \else
+      \@restonecolfalse
+    \fi
+    \lox@heading%
+    \setparsizes{0}{0}{\z@\@plus 1fil}\par@updaterelative
+  }
+\def\@listoffixmes@posttoc@scrreprt{%
+    \if@restonecol\twocolumn\fi
+  \endgroup
   }
-\def\@listoffixmes@posttoc@scrreprt{\if@restonecol\twocolumn\fi}
 
 \def\@listoffixmes@pretoc@scrbook{%
-  \if@twocolumn
-    \@restonecoltrue\onecolumn
-  \else
-    \@restonecolfalse
-  \fi
-  \chapter*{\listfixmename%
-    \@mkboth{\listfixmename}{\listfixmename}}%
-  }
-\def\@listoffixmes@posttoc@scrbook{\if@restonecol\twocolumn\fi}
+  \begingroup%
+    \if@twocolumn
+      \@restonecoltrue\onecolumn
+    \else
+      \@restonecolfalse
+    \fi
+    \lox@heading%
+    \setparsizes{0}{0}{\z@\@plus 1fil}\par@updaterelative
+}
+\def\@listoffixmes@posttoc@scrbook{%
+    \if@restonecol\twocolumn\fi
+  \endgroup
+}
 
 \newcommand\FXInline[2]{%
   \textbf{#1}: \emph{#2}}
 \newcommand\FXMargin[2]{%
-  \marginpar{\footnotesize\raggedleft\textbf{#1}: \emph{#2}}}
+  \marginpar[\footnotesize\raggedleft\textbf{#1}: \emph{#2}]{%
+    \footnotesize\raggedright\textbf{#1}: \emph{#2}}}
 \newcommand\FXMarginClue[1]{%
-  \marginpar{\footnotesize\raggedleft\textbf{#1}~!}}
+  \marginpar[\footnotesize\raggedleft\textbf{#1}~!]{%
+    \footnotesize\raggedright\textbf{#1}~!}}
 \newcommand\FXFootnote[2]{%
   \footnote{\textbf{#1}: \emph{#2}}}
 
@@ -151,18 +167,18 @@
 \def\fixme@setmargin{%
   \iffixme@marginclue%
     \PackageWarning{FiXme}{%
-      Marginal notes requested; tunrning marginal clues off}%
+      Marginal notes requested; turning marginal clues off}%
     \fixme@margincluefalse%
   \fi%
   \fixme@margintrue}
 \def\fixme@setmarginclue{%
   \iffixme@margin%
     \PackageWarning{FiXme}{%
-      Marginal clues requested; tunrning marginal notes off}%
+      Marginal clues requested; turning marginal notes off}%
     \fixme@marginfalse%
   \fi%
   \fixme@margincluetrue}
-\let\fixme@setfootnote\fixme@fottnotetrue
+\let\fixme@setfootnote\fixme@footnotetrue
 \let\fixme@setuser\fixme@usertrue
 \let\fixme@setindex\fixme@indextrue
 
@@ -283,12 +299,12 @@
   \@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', `marginclue', `footnote', %
-        `user',\MessageBreak
-        and `index'.\MessageBreak
-        Type X to quit, fix your document, and rerun LaTeX.}%
+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@set\fixme@option\endcsname%
     \fi}%
@@ -435,25 +451,28 @@
       \let\@listoffixmes@pretoc\@listoffixmes@pretoc@report
       \let\@listoffixmes@posttoc\@listoffixmes@posttoc@report}{
       \@ifclassloaded{book}{
-        \let\@listoffixmes@pretoc\@listoffixmes@pretoc@book
-        \let\@listoffixmes@posttoc\@listoffixmes@posttoc@book}{
-        \@ifclassloaded{scrartcl}{
-          \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrartcl
-          \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrartcl}{
-          \@ifclassloaded{scrreprt}{
-            \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrreprt
-            \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrreprt}{
-            \@ifclassloaded{scrbook}{
-              \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrbook
-              \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\@listoffixmes@pretoc\@listoffixmes@pretoc@book
+\let\@listoffixmes@posttoc\@listoffixmes@posttoc@book}{
+\@ifclassloaded{scrartcl}{
+  \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrartcl
+  \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrartcl}{
+  \@ifclassloaded{scrreprt}{
+    \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrreprt
+    \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrreprt}{
+    \@ifclassloaded{scrbook}{
+      \let\@listoffixmes@pretoc\@listoffixmes@pretoc@scrbook
+      \let\@listoffixmes@posttoc\@listoffixmes@posttoc@scrbook}{
+      \@ifclassloaded{amsbook}{
+\let\listoffixmes@draft\listoffixmes@draft@ams}{
+\@ifclassloaded{amsart}{
+  \let\listoffixmes@draft\listoffixmes@draft@ams}{
+  %% Use the article layout by default.
+  \let\@listoffixmes@pretoc\@listoffixmes@pretoc@article
+  \let\@listoffixmes@posttoc\@listoffixmes@posttoc@article}
+      }
+    }
+  }
+}
       }
     }
   }