fixme (6mar17)

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

1 files changed, 7 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
index 6105bbfc3f1..91ef6560dce 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
@@ -12,13 +12,11 @@
 
 %% This file is part of FiXme.
 
-%% FiXme may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.1
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.1 or later is part of all distributions of LaTeX
-%% version 1999/06/01 or later.
+%% FiXme may be distributed and/or modified under the conditions of the LaTeX
+%% Project Public License, either version 1.3 of this license or (at your option)
+%% any later version. The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
+%% distributions of LaTeX version 2005/12/01 or later.
 
 %% FiXme consists of the files listed in the file `README'.
 
@@ -38,6 +36,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
 \FXProvidesLayout{pdfcsigmargin}
 
 \RequirePackage{pdfcomment}
@@ -48,13 +47,8 @@
 \definecolor{fxerror}{rgb}{1.0000,0.2706,0.0000}
 \definecolor{fxfatal}{rgb}{1.0000,0.0000,0.0000}
 
-\providecommand*\@fxdosig[1]{%
-  \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
-    \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-
 \newcommand*\FXLayoutPDFCSigMargin[3]{%
-  \@fxdosig{#3}%
-  \pdfmargincomment[author={#3},color={fx#1}]{#2\@fxsignature}}
+  \pdfmargincomment[author={#3},color={fx#1}]{#2\@fxsignature{#3}}}
 \FXRegisterLayout*[margin,marginclue,marginnote,pdfmargin,pdfsigmargin]{%
   pdfcsigmargin}{%
   \FXLayoutPDFCSigMargin}