From ad60f0fc89a27a88fcfa2401037cfd1a44af9995 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 3 Jan 2019 22:00:08 +0000 Subject: fixme (3jan19) git-svn-id: svn://tug.org/texlive/trunk@49591 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fixme/fixme.sty | 24 +++++++++++++++++++--- .../latex/fixme/layouts/env/fxenvlayoutcolor.sty | 2 +- .../fixme/layouts/env/fxenvlayoutcolorsig.sty | 2 +- .../tex/latex/fixme/layouts/fxlayoutmarginnote.sty | 2 +- .../tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty | 2 +- .../tex/latex/fixme/layouts/fxlayoutpdfcnote.sty | 2 +- .../latex/fixme/layouts/fxlayoutpdfcsigmargin.sty | 2 +- .../latex/fixme/layouts/fxlayoutpdfcsignote.sty | 2 +- .../tex/latex/fixme/layouts/fxlayoutpdfmargin.sty | 2 +- .../tex/latex/fixme/layouts/fxlayoutpdfnote.sty | 2 +- .../latex/fixme/layouts/fxlayoutpdfsigmargin.sty | 9 ++++++-- .../tex/latex/fixme/layouts/fxlayoutpdfsignote.sty | 9 ++++++-- .../layouts/target/fxtargetlayoutchangebar.sty | 2 +- .../fixme/layouts/target/fxtargetlayoutcolor.sty | 2 +- .../fixme/layouts/target/fxtargetlayoutcolorcb.sty | 2 +- .../tex/latex/fixme/themes/fxthemecolor.sty | 2 +- .../tex/latex/fixme/themes/fxthemecolorsig.sty | 2 +- .../tex/latex/fixme/themes/fxthemesignature.sty | 2 +- 18 files changed, 50 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/latex/fixme') diff --git a/Master/texmf-dist/tex/latex/fixme/fixme.sty b/Master/texmf-dist/tex/latex/fixme/fixme.sty index 4bc6fbbe0e8..0c12233056b 100644 --- a/Master/texmf-dist/tex/latex/fixme/fixme.sty +++ b/Master/texmf-dist/tex/latex/fixme/fixme.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 Didier Verna %% This file is part of FiXme. @@ -37,7 +37,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fixme}[2017/03/05 v4.4 Collaborative annotations for LaTeX2e] +\ProvidesPackage{fixme}[2019/01/03 v4.5 Collaborative annotations for LaTeX2e] \RequirePackage{ifthen} \RequirePackage{verbatim} @@ -83,6 +83,18 @@ \define@boolkey[fx]{#2}{#3}[true]{#1} \@fxdefinevoidkey{#2}{no#3}{\@nameuse{fx@#2@#3}{false}}} +\newcommand*\@fxdefineoptioninterface[2]{% + \expandafter\newcommand\csname FXDefine#2Key\endcsname{% + \@fxdefinekey{#1}}% + \expandafter\newcommand\csname FXDefine#2CmdKey\endcsname{% + \@fxdefinecmdkey{#1}}% + \expandafter\newcommand\csname FXDefine#2ChoiceKey\endcsname{% + \@fxdefinechoicekey{#1}}% + \expandafter\newcommand\csname FXDefine#2VoidKey\endcsname{% + \@fxdefinevoidkey{#1}}% + \expandafter\newcommand\expandafter*\csname FXDefine#2BoolKey\endcsname[2][]{% + \@fxdefineboolkey[##1]{#1}{##2}}} + \let\l@fixme\l@figure \newcommand*\@fxdottedtocline[5]{% \ifnum #1>\c@tocdepth \else @@ -212,6 +224,8 @@ \@ifnextchar[%] {\@FXRegisterLayout{late}}{\@FXRegisterLayout{late}[]}}} +\@fxdefineoptioninterface{layout}{Layout} + \newcommand*\@fxtextstd[3]{\ignorespaces#3 \fxnotename{#1}: #2} \DeclareRobustCommand*\@fxsignature[1]{% \ifthenelse{\equal{#1}{}}{}{ -- {\@fxuseface{signature}#1}}} @@ -300,6 +314,8 @@ commands.\MessageBreak Otherwise, you must choose a different name.}}} +\@fxdefineoptioninterface{envlayout}{EnvLayout} + \@fxnewface{env} \newcommand*\FXEnvLayoutPlainBegin[2]{% \@fxuseface{env}\ignorespaces#2 \fxnotename{#1}: \ignorespaces} @@ -340,6 +356,8 @@ command.\MessageBreak Otherwise, you must choose another name.}}} +\@fxdefineoptioninterface{targetlayout}{TargetLayout} + \@fxnewface{target} \newcommand\FXTargetLayoutPlain[2]{\@fxuseface{target}#2} \FXRegisterTargetLayout{plain}{\FXTargetLayoutPlain} @@ -485,7 +503,7 @@ \def\@@@@fxbeginenv@final#1{\comment} \def\@@@@fxbeginenv@draft#1{\@fxenvlayout@begin{#1}{\cmdfx@note@author}} \def\@fxendenv@final#1{\endcomment} -\def\@fxendenv@draft#1{\@fxenvlayout@end{#1}{\cmdfx@note@author}} +\def\@fxendenv@draft#1{\unskip\@fxenvlayout@end{#1}{\cmdfx@note@author}} \def\@@@fxbeginenv#1#2{% \@fxpostconfigure\let\@fxpostconfigure\relax% 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 20c465ad0d3..7b996f42e91 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 2fb75189730..fd058bdbbb9 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 5927140ba36..52e1366f36e 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 1f9178d3852..13ac6ec9f25 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 e1081a913da..6681de2291c 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 91ef6560dce..11ff0ea397b 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 92de60a0cd6..cefcd4b656b 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 b4ffdb504ec..f753b047263 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 8a375d69829..c9b26d63cbc 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 52d0743e63e..8c0a9aa2d1d 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 Didier Verna %% This file is part of FiXme. @@ -42,7 +42,12 @@ \RequirePackage{pdfcomment} \newcommand*\FXLayoutPDFSigMargin[3]{% - \pdfmargincomment[author={#3}]{\@fxsigstd{#1}{#2}{#3}}} + \begingroup% + \ifthenelse{\equal{#3}{}}{% + \def\@fxsignature##1{}}{% + \def\@fxsignature##1{ -- {\@fxuseface{signature}#1}}}% + \pdfmargincomment[author={#3}]{\@fxsigstd{#1}{#2}{#3}}% + \endgroup} \FXRegisterLayout*[margin,marginclue,marginnote,pdfmargin]{pdfsigmargin}{% \FXLayoutPDFSigMargin} \endinput diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty index 4691897f8e3..76dfe6a05cc 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 Didier Verna %% This file is part of FiXme. @@ -42,7 +42,12 @@ \RequirePackage{pdfcomment} \newcommand*\FXLayoutPDFSigNote[3]{% - \pdfcomment[author={#3}]{\@fxsigstd{#1}{#2}{#3}}} + \begingroup% + \ifthenelse{\equal{#3}{}}{% + \def\@fxsignature##1{}}{% + \def\@fxsignature##1{ -- {\@fxuseface{signature}#1}}}% + \pdfcomment[author={#3}]{\@fxsigstd{#1}{#2}{#3}}% + \endgroup} \FXRegisterLayout[pdfnote]{pdfsignote}{\FXLayoutPDFSigNote} \endinput %% 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 b5b22568fea..ffb83e97ed5 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 336904ef6f3..32c2329ef45 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 5c787dd77d9..c610b08e6f9 100644 --- a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty +++ b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 a4dc7fd9816..aaa2df9df4b 100644 --- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty +++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 8fa7259385b..8e534636364 100644 --- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty +++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 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 a98547bcd9b..d87f611de14 100644 --- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty +++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty @@ -8,7 +8,7 @@ %% -%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017-2019 Didier Verna %% This file is part of FiXme. -- cgit v1.2.3