From ac0f6f57a4e17efee246ed3cc7bd721fb9f14e15 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 19 Jan 2017 01:24:18 +0000 Subject: fixme (18jan17) git-svn-id: svn://tug.org/texlive/trunk@42991 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/fixme/fixme.sty | 72 +++++----------------- .../latex/fixme/layouts/env/fxenvlayoutcolor.sty | 2 +- .../fixme/layouts/env/fxenvlayoutcolorsig.sty | 2 +- .../tex/latex/fixme/layouts/fxlayoutmarginnote.sty | 4 +- .../tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty | 4 +- .../tex/latex/fixme/layouts/fxlayoutpdfcnote.sty | 4 +- .../latex/fixme/layouts/fxlayoutpdfcsigmargin.sty | 4 +- .../latex/fixme/layouts/fxlayoutpdfcsignote.sty | 4 +- .../tex/latex/fixme/layouts/fxlayoutpdfmargin.sty | 4 +- .../tex/latex/fixme/layouts/fxlayoutpdfnote.sty | 4 +- .../latex/fixme/layouts/fxlayoutpdfsigmargin.sty | 4 +- .../tex/latex/fixme/layouts/fxlayoutpdfsignote.sty | 4 +- .../layouts/target/fxtargetlayoutchangebar.sty | 2 +- .../fixme/layouts/target/fxtargetlayoutcolor.sty | 2 +- .../fixme/layouts/target/fxtargetlayoutcolorcb.sty | 2 +- .../tex/latex/fixme/themes/fxthemecolor.sty | 8 +-- .../tex/latex/fixme/themes/fxthemecolorsig.sty | 8 +-- .../tex/latex/fixme/themes/fxthemesignature.sty | 8 +-- 18 files changed, 51 insertions(+), 91 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 71e735cc333..d5c646fe8c2 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -38,7 +38,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fixme}[2013/01/28 v4.2 Collaborative annotations for LaTeX2e] +\ProvidesPackage{fixme}[2017/01/18 v4.3 Collaborative annotations for LaTeX2e] \RequirePackage{ifthen} \RequirePackage{verbatim} @@ -138,40 +138,6 @@ \@mkboth{\MakeUppercase\@fxlistfixmename}{\MakeUppercase\@fxlistfixmename}}} \newcommand\@lox@psttc@book{\if@restonecol\twocolumn\fi} -\newcommand\lox@heading{\float@listhead{\@fxlistfixmename}} - -\newcommand\@lox@prtc@scrartcl{% - \begingroup% - \lox@heading% - \setparsizes{0}{0}{\z@\@plus 1fil}\par@updaterelative} -\let\@lox@psttc@scrartcl\endgroup - -\newcommand\@lox@prtc@scrreprt{% - \begingroup% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \lox@heading% - \setparsizes{0}{0}{\z@\@plus 1fil}\par@updaterelative} -\newcommand\@lox@psttc@scrreprt{% - \if@restonecol\twocolumn\fi - \endgroup} - -\newcommand\@lox@prtc@scrbook{% - \begingroup% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \lox@heading% - \setparsizes{0}{0}{\z@\@plus 1fil}\par@updaterelative} -\newcommand\@lox@psttc@scrbook{% - \if@restonecol\twocolumn\fi - \endgroup} - \let\lox@final\relax \newcommand\lox@draft{% \IfFileExists{\jobname .lox}{% @@ -240,12 +206,12 @@ \@fxnewface{margin} \newcommand*\FXLayoutMargin[3]{% \marginpar[% - \raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2]{% + {\raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2}]{% \raggedright\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2}} \FXRegisterLayout*{margin}{\FXLayoutMargin} \newcommand*\FXLayoutMarginClue[3]{% \marginpar[% - \raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}!]{% + {\raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}!}]{% \raggedright\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}!}} \FXRegisterLayout*[margin]{marginclue}{\FXLayoutMarginClue} \newcommand*\FXLayoutFootnote[3]{% @@ -253,7 +219,7 @@ \FXRegisterLayout{footnote}{\FXLayoutFootnote} \@fxnewface{inline} \newcommand*\FXLayoutInline[3]{% - {\@fxuseface{inline}\ignorespaces#3 \fxnotename{#1}: #2}} + { \@fxuseface{inline}\ignorespaces#3 \fxnotename{#1}: #2}} \FXRegisterLayout{inline}{\FXLayoutInline} \newcommand\fixmeindexname{\fixmelogo} \def\@wrindex#1{% @@ -707,23 +673,17 @@ \@ifclassloaded{book}{% \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}}}}}}}} - + \@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}}}}} + +\@ifpackageloaded{tocbasic}{% + \addtotoclist[fixme]{lox}% + \renewcommand\lox@draft{\listoftoc[\@fxlistfixmename]{lox}}}{} \ExecuteOptionsX[fx]<% mode,status,lang,log,note,face,layout,envlayout,targetlayout>{% mode=singleuser,% 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 e79e0a96528..e762118f888 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 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 96b49931a6d..13084f87397 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 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 d0e6451aad5..9c72619208e 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -44,7 +44,7 @@ \newcommand*\FXLayoutMarginNote[3]{% \marginnote[% - \raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2]{% + {\raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2}]{% \raggedright\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2}} \FXRegisterLayout*[margin,marginclue]{marginnote}{\FXLayoutMarginNote} \endinput diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty index eabaf2db2c7..2141186b2b8 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -53,7 +53,7 @@ \newcommand*\FXLayoutPDFCMargin[3]{% \@fxdocolon{#3}% - \pdfmargincomment[author=#3,color=fx#1]{\ignorespaces#3\@fxcolon#2}} + \pdfmargincomment[author={#3},color={fx#1}]{\ignorespaces#3\@fxcolon#2}} \FXRegisterLayout*[margin,marginclue,marginnote,pdfmargin]{pdfcmargin}{% \FXLayoutPDFCMargin} \endinput diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty index f8ecdd0cb9a..bc1af134214 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -53,7 +53,7 @@ \newcommand*\FXLayoutPDFCNote[3]{% \@fxdocolon{#3}% - \pdfcomment[author=#3,color=fx#1]{\ignorespaces#3\@fxcolon#2}} + \pdfcomment[author={#3},color={fx#1}]{\ignorespaces#3\@fxcolon#2}} \FXRegisterLayout[pdfnote]{pdfcnote}{\FXLayoutPDFCNote} \endinput %% diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty index 43932184bd2..6105bbfc3f1 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -54,7 +54,7 @@ \newcommand*\FXLayoutPDFCSigMargin[3]{% \@fxdosig{#3}% - \pdfmargincomment[author=#3,color=fx#1]{#2\@fxsignature}} + \pdfmargincomment[author={#3},color={fx#1}]{#2\@fxsignature}} \FXRegisterLayout*[margin,marginclue,marginnote,pdfmargin,pdfsigmargin]{% pdfcsigmargin}{% \FXLayoutPDFCSigMargin} diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty index 416547f133e..40b4e2ae9c3 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -54,7 +54,7 @@ \newcommand*\FXLayoutPDFCSigNote[3]{% \@fxdosig{#3}% - \pdfcomment[author=#3,color=fx#1]{#2\@fxsignature}} + \pdfcomment[author={#3},color={fx#1}]{#2\@fxsignature}} \FXRegisterLayout[pdfnote,pdfcnote]{pdfcsignote}{\FXLayoutPDFCSigNote} \endinput %% diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty index 5b51fe6f7d4..a8282ba5571 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -43,7 +43,7 @@ \RequirePackage{pdfcomment} \newcommand*\FXLayoutPDFMargin[3]{% - \pdfmargincomment[author=#3]{\ignorespaces#3 \fxnotename{#1}: #2}} + \pdfmargincomment[author={#3}]{\ignorespaces#3 \fxnotename{#1}: #2}} \FXRegisterLayout*[margin,marginclue,marginnote]{pdfmargin}{% \FXLayoutPDFMargin} \endinput diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty index d8d36191b1b..882f68f4c95 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -43,7 +43,7 @@ \RequirePackage{pdfcomment} \newcommand*\FXLayoutPDFNote[3]{% - \pdfcomment[author=#3]{\ignorespaces#3 \fxnotename{#1}: #2}} + \pdfcomment[author={#3}]{\ignorespaces#3 \fxnotename{#1}: #2}} \FXRegisterLayout{pdfnote}{\FXLayoutPDFNote} \endinput %% diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty index c43a62fa935..751ed048977 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -48,7 +48,7 @@ \newcommand*\FXLayoutPDFSigMargin[3]{% \@fxdosig{#3}% - \pdfmargincomment[author=#3]{\fxnotename{#1}: #2\@fxsignature}} + \pdfmargincomment[author={#3}]{\fxnotename{#1}: #2\@fxsignature}} \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 846a3a127d5..4abb7152dcb 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -48,7 +48,7 @@ \newcommand*\FXLayoutPDFSigNote[3]{% \@fxdosig{#3}% - \pdfcomment[author=#3]{\fxnotename{#1}: #2\@fxsignature}} + \pdfcomment[author={#3}]{\fxnotename{#1}: #2\@fxsignature}} \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 fee672bf19f..09624c4253d 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 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 3e3db415df6..be5fe683fb0 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 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 feabe0406ac..34537af3346 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 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 416f1b39d39..b227925ede0 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -53,14 +53,14 @@ \renewcommand*\FXLayoutMargin[3]{% \@fxdocolon{#3}% \marginpar[% - \raggedleft\@fxuseface{margin}\color{fx#1}\ignorespaces#3\@fxcolon#2]{% + {\raggedleft\@fxuseface{margin}\color{fx#1}\ignorespaces#3\@fxcolon#2}]{% \raggedright\@fxuseface{margin}\color{fx#1}\ignorespaces#3\@fxcolon#2}} \renewcommand*\FXLayoutMarginClue[3]{% - \marginpar[\raggedleft\@fxuseface{margin}\color{fx#1}\ignorespaces#3!]{% + \marginpar[{\raggedleft\@fxuseface{margin}\color{fx#1}\ignorespaces#3!}]{% \raggedright\@fxuseface{margin}\color{fx#1}\ignorespaces#3!}} \renewcommand*\FXLayoutInline[3]{% \@fxdocolon{#3}% - {\@fxuseface{inline}\color{fx#1}\ignorespaces#3\@fxcolon#2}} + { \textcolor{fx#1}{\@fxuseface{inline}\ignorespaces#3\@fxcolon#2}}} \renewcommand*\FXLayoutIndex[3]{% \iffx@mode@multiuser% \index{***@\fixmeindexname:% diff --git a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty index db231ced3f9..ec082ee94f8 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -53,15 +53,15 @@ \renewcommand*\FXLayoutMargin[3]{% \@fxdosig{#3}% \marginpar[% - \raggedleft\@fxuseface{margin}\color{fx#1}#2\@fxsignature]{% + {\raggedleft\@fxuseface{margin}\color{fx#1}#2\@fxsignature}]{% \raggedright\@fxuseface{margin}\color{fx#1}#2\@fxsignature}} \renewcommand*\FXLayoutMarginClue[3]{% \@fxdosig{#3}% - \marginpar[\raggedleft\@fxuseface{margin}\color{fx#1}!\@fxsignature]{% + \marginpar[{\raggedleft\@fxuseface{margin}\color{fx#1}!\@fxsignature}]{% \raggedright\@fxuseface{margin}\color{fx#1}!\@fxsignature}} \renewcommand*\FXLayoutInline[3]{% \@fxdosig{#3}% - {\@fxuseface{inline}\color{fx#1}#2\@fxsignature}} + { \textcolor{fx#1}{\@fxuseface{inline}#2\@fxsignature}}} \renewcommand*\FXLayoutIndex[3]{% \@fxdosig{#3}% \iffx@mode@multiuser% diff --git a/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty b/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty index bc769c1a726..3e3ff4a0825 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 Didier Verna +%% Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna %% This file is part of FiXme. @@ -48,15 +48,15 @@ \renewcommand*\FXLayoutMargin[3]{% \@fxdosig{#3}% \marginpar[% - \raggedleft\@fxuseface{margin}\fxnotename{#1}: #2\@fxsignature]{% + {\raggedleft\@fxuseface{margin}\fxnotename{#1}: #2\@fxsignature}]{% \raggedright\@fxuseface{margin}\fxnotename{#1}: #2\@fxsignature}} \renewcommand*\FXLayoutMarginClue[3]{% \@fxdosig{#3}% - \marginpar[\raggedleft\@fxuseface{margin}\fxnotename{#1}!\@fxsignature]{% + \marginpar[{\raggedleft\@fxuseface{margin}\fxnotename{#1}!\@fxsignature}]{% \raggedright\@fxuseface{margin}\fxnotename{#1}!\@fxsignature}} \renewcommand*\FXLayoutInline[3]{% \@fxdosig{#3}% - {\@fxuseface{inline}\fxnotename{#1}: #2\@fxsignature}} + { \@fxuseface{inline}\fxnotename{#1}: #2\@fxsignature}} \renewcommand*\FXLayoutIndex[3]{% \@fxdosig{#3}% \iffx@mode@multiuser% -- cgit v1.2.3