summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fixme
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-06 21:58:12 +0000
committerKarl Berry <karl@freefriends.org>2017-03-06 21:58:12 +0000
commitf4b34164a525146ab7114c5bcaa5b760202b0033 (patch)
treeb3df6c83f9553c57079c87a15f96a8e21b13470f /Master/texmf-dist/tex/latex/fixme
parent4ee4b14be744db40a2a178acc6e97b24bc3ae2b3 (diff)
fixme (6mar17)
git-svn-id: svn://tug.org/texlive/trunk@43413 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fixme')
-rw-r--r--Master/texmf-dist/tex/latex/fixme/fixme.sty73
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty13
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty19
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty18
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty13
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty13
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty20
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty20
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty15
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty15
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty20
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty20
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty13
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty13
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty13
-rw-r--r--Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty13
-rw-r--r--Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty37
-rw-r--r--Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty38
18 files changed, 167 insertions, 219 deletions
diff --git a/Master/texmf-dist/tex/latex/fixme/fixme.sty b/Master/texmf-dist/tex/latex/fixme/fixme.sty
index d5c646fe8c2..4bc6fbbe0e8 100644
--- a/Master/texmf-dist/tex/latex/fixme/fixme.sty
+++ b/Master/texmf-dist/tex/latex/fixme/fixme.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'.
@@ -37,8 +35,9 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fixme}[2017/01/18 v4.3 Collaborative annotations for LaTeX2e]
+\ProvidesPackage{fixme}[2017/03/05 v4.4 Collaborative annotations for LaTeX2e]
\RequirePackage{ifthen}
\RequirePackage{verbatim}
@@ -63,6 +62,12 @@
\newcommand\@fxkeyifundefined{\key@ifundefined[fx]}
\newcommand\@fxdefinekey{\define@key[fx]}
+\newcommand\@fxdefinecmdkey{\define@cmdkey[fx]}
+\newcommand\@fxdefinechoicekey{\define@choicekey[fx]}
+\newcommand\@fxsetkeys{\setkeys[fx]}
+%% Note: currently unused
+%% \newcommand\@fxpresetkeys{\presetkeys[fx]}
+
\newcommand*\@fxvoidkeyerror[2]{%
\@fxpkgerror{misuse of key '#1'}{%
You have given the key '#1' the argument '#2' but it takes
@@ -78,13 +83,6 @@
\define@boolkey[fx]{#2}{#3}[true]{#1}
\@fxdefinevoidkey{#2}{no#3}{\@nameuse{fx@#2@#3}{false}}}
-\newcommand\@fxdefinecmdkey{\define@cmdkey[fx]}
-
-\newcommand\@fxdefinechoicekey{\define@choicekey[fx]}
-
-\newcommand\@fxsetkeys{\setkeys[fx]}
-%% Note: currently unused
-%% \newcommand\@fxpresetkeys{\presetkeys[fx]}
\let\l@fixme\l@figure
\newcommand*\@fxdottedtocline[5]{%
\ifnum #1>\c@tocdepth \else
@@ -139,12 +137,23 @@
\newcommand\@lox@psttc@book{\if@restonecol\twocolumn\fi}
\let\lox@final\relax
+
+\newread\lox@file
+\newif\iflox@typeset
+\def\lox@eol{\par}
\newcommand\lox@draft{%
- \IfFileExists{\jobname .lox}{%
- \@lox@prtc%
- \@starttoc{lox}%
- \@lox@psttc}{%
- \@starttoc{lox}}}
+ \lox@typesetfalse%
+ \openin\lox@file\jobname.lox\relax
+ \ifeof\lox@file\else
+ \read\lox@file to \lox@maybeeol
+ \ifeof\lox@file
+ \ifx\lox@maybeeol\lox@eol\else\lox@typesettrue\fi
+ \else
+ \lox@typesettrue
+ \fi
+ \fi
+ \closein\lox@file
+ \iflox@typeset\@lox@prtc\@starttoc{lox}\@lox@psttc\else\@starttoc{lox}\fi}
\newcommand\lox@draft@ams{\@starttoc{lox}\@fxlistfixmename}
\newcommand*\fxsetface[2]{\@fxsetkeys{face}{#1face=#2}}
@@ -203,23 +212,24 @@
\@ifnextchar[%]
{\@FXRegisterLayout{late}}{\@FXRegisterLayout{late}[]}}}
+\newcommand*\@fxtextstd[3]{\ignorespaces#3 \fxnotename{#1}: #2}
+\DeclareRobustCommand*\@fxsignature[1]{%
+ \ifthenelse{\equal{#1}{}}{}{ -- {\@fxuseface{signature}#1}}}
+\newcommand*\@fxsigstd[3]{\fxnotename{#1}: #2\@fxsignature{#3}}
\@fxnewface{margin}
\newcommand*\FXLayoutMargin[3]{%
- \marginpar[%
- {\raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2}]{%
- \raggedright\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2}}
+ \marginpar[\raggedleft\@fxuseface{margin}\@fxtextstd{#1}{#2}{#3}]{%
+ \raggedright\@fxuseface{margin}\@fxtextstd{#1}{#2}{#3}}}
\FXRegisterLayout*{margin}{\FXLayoutMargin}
\newcommand*\FXLayoutMarginClue[3]{%
\marginpar[%
{\raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}!}]{%
\raggedright\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}!}}
\FXRegisterLayout*[margin]{marginclue}{\FXLayoutMarginClue}
-\newcommand*\FXLayoutFootnote[3]{%
- \footnote{\ignorespaces#3 \fxnotename{#1}: #2}}
+\newcommand*\FXLayoutFootnote[3]{\footnote{\@fxtextstd{#1}{#2}{#3}}}
\FXRegisterLayout{footnote}{\FXLayoutFootnote}
\@fxnewface{inline}
-\newcommand*\FXLayoutInline[3]{%
- { \@fxuseface{inline}\ignorespaces#3 \fxnotename{#1}: #2}}
+\newcommand*\FXLayoutInline[3]{ \@fxuseface{inline}\@fxtextstd{#1}{#2}{#3}}
\FXRegisterLayout{inline}{\FXLayoutInline}
\newcommand\fixmeindexname{\fixmelogo}
\def\@wrindex#1{%
@@ -248,7 +258,7 @@
\FXRegisterLayout{index}{\FXLayoutIndex}
\newcommand*\FXLayoutContentsLine[3]{%
\iffx@mode@multiuser%
- \fxaddcontentsline{\ignorespaces#3 \fxnotename{#1}: #2}%
+ \fxaddcontentsline{\@fxtextstd{#1}{#2}{#3}}%
\else%
\fxaddcontentsline{\fxnotename{#1}: #2}%
\fi}
@@ -297,12 +307,9 @@
\FXRegisterEnvLayout{plain}{\FXEnvLayoutPlainBegin}{\FXEnvLayoutPlainEnd}
\@fxnewface[\itshape]{signature}
-\newcommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
\newcommand*\FXEnvLayoutSignatureBegin[2]{%
\@fxuseface{env}\fxnotename{#1}: \ignorespaces}
-\newcommand*\FXEnvLayoutSignatureEnd[2]{\@fxdosig{#2}\@fxsignature}
+\newcommand*\FXEnvLayoutSignatureEnd[2]{\@fxsignature{#2}}
\FXRegisterEnvLayout{signature}{%
\FXEnvLayoutSignatureBegin}{\FXEnvLayoutSignatureEnd}
@@ -412,7 +419,6 @@
\@nameuse{@fxlayout@\@fxlt}{#1}{#2}{\cmdfx@note@author}%
\fi}}
\newcommand*\@fxissuecommonlayouts[2]{%
- \FXLayoutContentsLine{#1}{#2}{\cmdfx@note@author}%
\iffx@log@silent\else\@nameuse{@fxlog@#1}{#2}\fi}
\newcommand*\@@@fxnote@early@final[2]{%
@@ -428,6 +434,7 @@
\@fxissueearlydraftlayouts{#1}{#2}}
\newcommand*\@@@fxnote@late@draft[2]{%
\@fxissuelatedraftlayouts{#1}{#2}%
+ \FXLayoutContentsLine{#1}{#2}{\cmdfx@note@author}%
\@fxissuecommonlayouts{#1}{#2}}
\newcommand*\@fxpostconfigure{%
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 e762118f888..20c465ad0d3 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.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}
\FXProvidesEnvLayout{color}
\RequirePackage{color}
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 13084f87397..2fb75189730 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.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,15 +36,12 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
\FXProvidesEnvLayout{colorsig}
\RequirePackage{color}
\@fxnewface[\itshape]{signature}
-\providecommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-
\definecolor{fxnote}{rgb}{0.0000,0.6000,0.0000}
\definecolor{fxwarning}{rgb}{1.0000,0.5490,0.0000}
\definecolor{fxerror}{rgb}{1.0000,0.2706,0.0000}
@@ -55,7 +50,7 @@
\fxsetface{env}{}
\newcommand*\FXEnvLayoutColorSigBegin[2]{\@fxuseface{env}\color{fx#1}}
-\newcommand*\FXEnvLayoutColorSigEnd[2]{\@fxdosig{#2}\@fxsignature}
+\newcommand*\FXEnvLayoutColorSigEnd[2]{\@fxsignature{#2}}
\FXRegisterEnvLayout{colorsig}{%
\FXEnvLayoutColorSigBegin}{\FXEnvLayoutColorSigEnd}
\endinput
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
index 9c72619208e..5927140ba36 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.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,14 +36,14 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
\FXProvidesLayout{marginnote}
\RequirePackage{marginnote}
\newcommand*\FXLayoutMarginNote[3]{%
- \marginnote[%
- {\raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2}]{%
- \raggedright\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2}}
+ \marginnote[\raggedleft\@fxuseface{margin}\@fxtextstd{#1}{#2}{#3}]{%
+ \raggedright\@fxuseface{margin}\@fxtextstd{#1}{#2}{#3}}}
\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 2141186b2b8..1f9178d3852 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.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{pdfcmargin}
\RequirePackage{pdfcomment}
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
index bc1af134214..e1081a913da 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.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{pdfcnote}
\RequirePackage{pdfcomment}
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}
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
index 40b4e2ae9c3..92de60a0cd6 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.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{pdfcsignote}
\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*\FXLayoutPDFCSigNote[3]{%
- \@fxdosig{#3}%
- \pdfcomment[author={#3},color={fx#1}]{#2\@fxsignature}}
+ \pdfcomment[author={#3},color={fx#1}]{#2\@fxsignature{#3}}}
\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 a8282ba5571..b4ffdb504ec 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.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,12 +36,13 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
\FXProvidesLayout{pdfmargin}
\RequirePackage{pdfcomment}
\newcommand*\FXLayoutPDFMargin[3]{%
- \pdfmargincomment[author={#3}]{\ignorespaces#3 \fxnotename{#1}: #2}}
+ \pdfmargincomment[author={#3}]{\@fxtextstd{#1}{#2}{#3}}}
\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 882f68f4c95..8a375d69829 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.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,12 +36,13 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
\FXProvidesLayout{pdfnote}
\RequirePackage{pdfcomment}
\newcommand*\FXLayoutPDFNote[3]{%
- \pdfcomment[author={#3}]{\ignorespaces#3 \fxnotename{#1}: #2}}
+ \pdfcomment[author={#3}]{\@fxtextstd{#1}{#2}{#3}}}
\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 751ed048977..52d0743e63e 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.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,17 +36,13 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
\FXProvidesLayout{pdfsigmargin}
\RequirePackage{pdfcomment}
-\providecommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-
\newcommand*\FXLayoutPDFSigMargin[3]{%
- \@fxdosig{#3}%
- \pdfmargincomment[author={#3}]{\fxnotename{#1}: #2\@fxsignature}}
+ \pdfmargincomment[author={#3}]{\@fxsigstd{#1}{#2}{#3}}}
\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 4abb7152dcb..4691897f8e3 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.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,17 +36,13 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
\FXProvidesLayout{pdfsignote}
\RequirePackage{pdfcomment}
-\providecommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-
\newcommand*\FXLayoutPDFSigNote[3]{%
- \@fxdosig{#3}%
- \pdfcomment[author={#3}]{\fxnotename{#1}: #2\@fxsignature}}
+ \pdfcomment[author={#3}]{\@fxsigstd{#1}{#2}{#3}}}
\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 09624c4253d..b5b22568fea 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.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}
\FXProvidesTargetLayout{changebar}
\RequirePackage{changebar}
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 be5fe683fb0..336904ef6f3 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.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}
\FXProvidesTargetLayout{color}
\RequirePackage{color}
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 34537af3346..5c787dd77d9 100644
--- a/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.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}
\FXProvidesTargetLayout{colorcb}
\RequirePackage{color}
diff --git a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
index b227925ede0..a4dc7fd9816 100644
--- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
+++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.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}
\FXProvidesTheme{color}
\RequirePackage{color}
diff --git a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty
index ec082ee94f8..8fa7259385b 100644
--- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty
+++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.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}
\FXProvidesTheme{colorsig}
\RequirePackage{color}
@@ -47,27 +46,20 @@
\fxsetface{inline}{}
-\renewcommand*\FXLayoutFootnote[3]{%
- \@fxdosig{#3}%
- \footnote{\color{fx#1}#2\@fxsignature}}
+\renewcommand*\FXLayoutFootnote[3]{\footnote{\color{fx#1}#2\@fxsignature{#3}}}
\renewcommand*\FXLayoutMargin[3]{%
- \@fxdosig{#3}%
- \marginpar[%
- {\raggedleft\@fxuseface{margin}\color{fx#1}#2\@fxsignature}]{%
- \raggedright\@fxuseface{margin}\color{fx#1}#2\@fxsignature}}
+ \marginpar[{\raggedleft\@fxuseface{margin}\color{fx#1}#2\@fxsignature{#3}}]{%
+ \raggedright\@fxuseface{margin}\color{fx#1}#2\@fxsignature{#3}}}
\renewcommand*\FXLayoutMarginClue[3]{%
- \@fxdosig{#3}%
- \marginpar[{\raggedleft\@fxuseface{margin}\color{fx#1}!\@fxsignature}]{%
- \raggedright\@fxuseface{margin}\color{fx#1}!\@fxsignature}}
+ \marginpar[{\raggedleft\@fxuseface{margin}\color{fx#1}!\@fxsignature{#3}}]{%
+ \raggedright\@fxuseface{margin}\color{fx#1}!\@fxsignature{#3}}}
\renewcommand*\FXLayoutInline[3]{%
- \@fxdosig{#3}%
- { \textcolor{fx#1}{\@fxuseface{inline}#2\@fxsignature}}}
+ { \textcolor{fx#1}{\@fxuseface{inline}#2\@fxsignature{#3}}}}
\renewcommand*\FXLayoutIndex[3]{%
- \@fxdosig{#3}%
\iffx@mode@multiuser%
\index{***@\fixmeindexname:%
!\@nameuse{@fx#1key}@\fxnotesname{#1}:%
- !{\color{fx#1}\@nameuse{thefx#1count}: #2\@fxsignature}}%
+ !{\color{fx#1}\@nameuse{thefx#1count}: #2\@fxsignature{#3}}}%
\index{***#3@\fixmeindexname{} (#3):%
!\@nameuse{@fx#1key}@\fxnotesname{#1}:%
!{\color{fx#1}\@nameuse{thefx#1count}: #2}}%
@@ -78,8 +70,7 @@
\fi}
\renewcommand*\FXLayoutContentsLine[3]{%
\iffx@mode@multiuser%
- \@fxdosig{#3}%
- \fxaddcontentsline{\color{fx#1}#2\@fxsignature}%
+ \fxaddcontentsline{\color{fx#1}#2\@fxsignature{#3}}%
\else%
\fxaddcontentsline{\color{fx#1}#2}%
\fi}
diff --git a/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty b/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty
index 3e3ff4a0825..a98547bcd9b 100644
--- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty
+++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.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,31 +36,24 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}
\FXProvidesTheme{signature}
\fxuseenvlayout{signature}
-\renewcommand*\FXLayoutFootnote[3]{%
- \@fxdosig{#3}%
- \footnote{\fxnotename{#1}: #2\@fxsignature}}
+\renewcommand*\FXLayoutFootnote[3]{\footnote{\@fxsigstd{#1}{#2}{#3}}}
\renewcommand*\FXLayoutMargin[3]{%
- \@fxdosig{#3}%
- \marginpar[%
- {\raggedleft\@fxuseface{margin}\fxnotename{#1}: #2\@fxsignature}]{%
- \raggedright\@fxuseface{margin}\fxnotename{#1}: #2\@fxsignature}}
+ \marginpar[{\raggedleft\@fxuseface{margin}\@fxsigstd{#1}{#2}{#3}}]{%
+ \raggedright\@fxuseface{margin}\@fxsigstd{#1}{#2}{#3}}}
\renewcommand*\FXLayoutMarginClue[3]{%
- \@fxdosig{#3}%
- \marginpar[{\raggedleft\@fxuseface{margin}\fxnotename{#1}!\@fxsignature}]{%
- \raggedright\@fxuseface{margin}\fxnotename{#1}!\@fxsignature}}
-\renewcommand*\FXLayoutInline[3]{%
- \@fxdosig{#3}%
- { \@fxuseface{inline}\fxnotename{#1}: #2\@fxsignature}}
+ \marginpar[{\raggedleft\@fxuseface{margin}\fxnotename{#1}!\@fxsignature{#3}}]{%
+ \raggedright\@fxuseface{margin}\fxnotename{#1}!\@fxsignature{#3}}}
+\renewcommand*\FXLayoutInline[3]{{ \@fxuseface{inline}\@fxsigstd{#1}{#2}{#3}}}
\renewcommand*\FXLayoutIndex[3]{%
- \@fxdosig{#3}%
\iffx@mode@multiuser%
\index{***@\fixmeindexname:%
!\@nameuse{@fx#1key}@\fxnotesname{#1}:%
- !\@nameuse{thefx#1count}: #2\@fxsignature}%
+ !\@nameuse{thefx#1count}: #2\@fxsignature{#3}}%
\index{***#3@\fixmeindexname{} (#3):%
!\@nameuse{@fx#1key}@\fxnotesname{#1}:%
!\@nameuse{thefx#1count}: #2}%
@@ -73,8 +64,7 @@
\fi}
\renewcommand*\FXLayoutContentsLine[3]{%
\iffx@mode@multiuser%
- \@fxdosig{#3}%
- \fxaddcontentsline{\fxnotename{#1}: #2\@fxsignature}%
+ \fxaddcontentsline{\@fxsigstd{#1}{#2}{#3}}%
\else%
\fxaddcontentsline{\fxnotename{#1}: #2}%
\fi}