summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-10-03 15:28:25 +0000
committerKarl Berry <karl@freefriends.org>2009-10-03 15:28:25 +0000
commitb316efb7c226ec53ad21c090980220a4dacd15ff (patch)
tree7f08ae23b5af61ca3574aa88326cea1606cc9910 /Master/texmf-dist/tex
parentffae7911290698a9da1d39087cd103badc4c586c (diff)
fixme 4.1 (30sep09)
git-svn-id: svn://tug.org/texlive/trunk@15612 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/fixme/fixme.sty57
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty53
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty62
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty61
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty64
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty62
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty52
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty51
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty57
-rw-r--r--Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty56
-rw-r--r--Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty2
11 files changed, 554 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/fixme/fixme.sty b/Master/texmf-dist/tex/latex/fixme/fixme.sty
index 91683fa26bc..b599ed3a753 100644
--- a/Master/texmf-dist/tex/latex/fixme/fixme.sty
+++ b/Master/texmf-dist/tex/latex/fixme/fixme.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fixme}[2009/09/21 v4.0 Insert fixme notes in your documents]
+\ProvidesPackage{fixme}[2009/09/30 v4.1 Insert fixme notes in your documents]
\RequirePackage{ifthen}
\RequirePackage{verbatim}
@@ -51,6 +51,17 @@
\newcommand\@fxpkgwarning{\PackageWarning{FiXme}}
\newcommand\@fxpkgerror{\PackageError{FiXme}}
+\newcommand*\@fxaddtolist[2]{%
+ \expandafter\ifx\csname #1\endcsname\relax%
+ \expandafter\def\csname #1\endcsname{#2}%
+ \else%
+ \expandafter\ifx\csname #1\endcsname\empty%
+ \expandafter\g@addto@macro\csname #1\endcsname{#2}%
+ \else%
+ \expandafter\g@addto@macro\csname #1\endcsname{,#2}%
+ \fi%
+ \fi}
+
\newcommand\@fxkeyifundefined{\key@ifundefined[fx]}
\newcommand\@fxdefinekey{\define@key[fx]}
\newcommand*\@fxvoidkeyerror[2]{%
@@ -192,15 +203,28 @@ mu$}\hfill
\let\@fxearlylayouts\empty
\let\@fxlatelayouts\empty
\newcommand*\FXProvidesLayout[1]{\ProvidesPackage{fxlayout#1}}
+\newcommand*\@fxrecordlayoutmutex[2]{%
+ \edef\@fxlts{\zap@space#2 \@empty}%
+ \def\@fxexpr{\@fxaddtolist{@fxlayout@#1@mutex}}%
+ \expandafter\@fxexpr\expandafter{\@fxlts}%
+ \@for\@fxlt:=\@fxlts\do{\@fxaddtolist{@fxlayout@\@fxlt @mutex}{#1}}}
+\newcommand*\@fxhandlelayoutmutex[1]{%
+ \ifthenelse{\boolean{fx@layout@#1}}{%
+ \def\@fxexpr{\@for\@fxlt:=}%
+ \expandafter\@fxexpr\csname @fxlayout@#1@mutex\endcsname\do{%
+ \@ifundefined{iffx@layout@\@fxlt}{}{%
+ \ifthenelse{\boolean{fx@layout@\@fxlt}}{%
+ \@fxpkgwarning{%
+ #1 layout requested;\MessageBreak
+ turning \@fxlt\space layout off}%
+ \@nameuse{fx@layout@\@fxlt}{false}}{}}}}{}}
+
\def\@FXRegisterLayout#1[#2]#3#4{%
\@fxkeyifundefined{layout}{#3}{%
- \@fxdefineboolkey[#2]{layout}{#3}%
+ \@fxrecordlayoutmutex{#3}{#2}%
+ \@fxdefineboolkey[\@fxhandlelayoutmutex{#3}]{layout}{#3}%
\expandafter\def\csname @fxlayout@#3\endcsname{#4}%
- \expandafter\ifx\csname @fx#1layouts\endcsname\empty%
- \expandafter\g@addto@macro\csname @fx#1layouts\endcsname{#3}%
- \else%
- \expandafter\g@addto@macro\csname @fx#1layouts\endcsname{,#3}%
- \fi}{%
+ \@fxaddtolist{@fx#1layouts}{#3}}{%
\@fxpkgerror{layout '#3' already registered}{%
You have called \string\FXRegisterLayout\space with a name already
in use.\MessageBreak
@@ -219,24 +243,12 @@ mu$}\hfill
\marginpar[%
\raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2]{%
\raggedright\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}: #2}}
-\FXRegisterLayout*[%
- \ifthenelse{\boolean{fx@layout@margin}\and\boolean{fx@layout@marginclue}}{%
- \@fxpkgwarning{%
- marginal notes requested;\MessageBreak
- turning marginal clues off}%
- \fx@layout@marginclue{false}}]{%
- margin}{\FXLayoutMargin}
+\FXRegisterLayout*{margin}{\FXLayoutMargin}
\newcommand*\FXLayoutMarginClue[3]{%
\marginpar[%
\raggedleft\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}!]{%
\raggedright\@fxuseface{margin}\ignorespaces#3 \fxnotename{#1}!}}
-\FXRegisterLayout*[%
- \ifthenelse{\boolean{fx@layout@marginclue}\and\boolean{fx@layout@margin}}{%
- \@fxpkgwarning{%
- marginal clues requested;\MessageBreak
- turning marginal notes off}%
- \fx@layout@margin{false}}]{%
- marginclue}{\FXLayoutMarginClue}
+\FXRegisterLayout*[margin]{marginclue}{\FXLayoutMarginClue}
\newcommand*\FXLayoutFootnote[3]{%
\footnote{\ignorespaces#3 \fxnotename{#1}: #2}}
\FXRegisterLayout{footnote}{\FXLayoutFootnote}
@@ -280,6 +292,7 @@ mu$}\hfill
\edef\@fxlts{\zap@space#1 \@empty}%
\@for\@fxlt:=\@fxlts\do{\usepackage{fxlayout#1}}}
+\newcommand\@fxsetlayoutkeys{\@fxsetkeys{layout}}
\def\@fxparselayout#1#2#3\relax{\def\@fxltprefix{#1#2}\def\@fxltrest{#3}}
\newcommand*\fxuselayouts[1]{%
\edef\@fxlts{\zap@space#1 \@empty}%
@@ -419,7 +432,7 @@ turning margin layout form off}}{%
\@fxpkginfo{%
inner mode detected;\MessageBreak
turning marginclue layout form off}}{}}%
- \expandafter\fxuselayouts\expandafter{%
+ \expandafter\@fxsetlayoutkeys\expandafter{%
\cmdfx@layout@innerlayout,nomargin,nomarginclue}%
\fi}
\newcommand*\@fxissueearlydraftlayouts[2]{%
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
new file mode 100644
index 00000000000..b254e194e5b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
@@ -0,0 +1,53 @@
+%%
+%% This is file `fxlayoutmarginnote.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fixme.dtx (with options: `fxlayoutmarginnote')
+%%
+
+
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
+
+%% 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 consists of the files listed in the file `README'.
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\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}}
+\FXRegisterLayout*[margin,marginclue]{marginnote}{\FXLayoutMarginNote}
+\endinput
+%%
+%% End of file `fxlayoutmarginnote.sty'.
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty
new file mode 100644
index 00000000000..cee6be30b85
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty
@@ -0,0 +1,62 @@
+%%
+%% This is file `fxlayoutpdfcmargin.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fixme.dtx (with options: `fxlayoutpdfcmargin')
+%%
+
+
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
+
+%% 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 consists of the files listed in the file `README'.
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\NeedsTeXFormat{LaTeX2e}
+\FXProvidesLayout{pdfcmargin}
+
+\RequirePackage{pdfcomment}
+\RequirePackage{xcolor}
+
+\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}
+\definecolor{fxfatal}{rgb}{1.0000,0.0000,0.0000}
+
+\providecommand*\@fxdocolon[1]{%
+ \ifthenelse{\equal{#1}{}}{\def\@fxcolon{}}{\def\@fxcolon{: }}}
+
+\newcommand*\FXLayoutPDFCMargin[3]{%
+ \@fxdocolon{#3}%
+ \pdfmargincomment[author=#3,color=fx#1]{\ignorespaces#3\@fxcolon#2}}
+\FXRegisterLayout*[margin,marginclue,marginnote,pdfmargin]{pdfcmargin}{%
+ \FXLayoutPDFCMargin}
+\endinput
+%%
+%% End of file `fxlayoutpdfcmargin.sty'.
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
new file mode 100644
index 00000000000..d7447372288
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
@@ -0,0 +1,61 @@
+%%
+%% This is file `fxlayoutpdfcnote.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fixme.dtx (with options: `fxlayoutpdfcnote')
+%%
+
+
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
+
+%% 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 consists of the files listed in the file `README'.
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\NeedsTeXFormat{LaTeX2e}
+\FXProvidesLayout{pdfcnote}
+
+\RequirePackage{pdfcomment}
+\RequirePackage{xcolor}
+
+\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}
+\definecolor{fxfatal}{rgb}{1.0000,0.0000,0.0000}
+
+\providecommand*\@fxdocolon[1]{%
+ \ifthenelse{\equal{#1}{}}{\def\@fxcolon{}}{\def\@fxcolon{: }}}
+
+\newcommand*\FXLayoutPDFCNote[3]{%
+ \@fxdocolon{#3}%
+ \pdfcomment[author=#3,color=fx#1]{\ignorespaces#3\@fxcolon#2}}
+\FXRegisterLayout[pdfnote]{pdfcnote}{\FXLayoutPDFCNote}
+\endinput
+%%
+%% End of file `fxlayoutpdfcnote.sty'.
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
new file mode 100644
index 00000000000..ea1de7069d5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
@@ -0,0 +1,64 @@
+%%
+%% This is file `fxlayoutpdfcsigmargin.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fixme.dtx (with options: `fxlayoutpdfcsigmargin')
+%%
+
+
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
+
+%% 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 consists of the files listed in the file `README'.
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\NeedsTeXFormat{LaTeX2e}
+\FXProvidesLayout{pdfcsigmargin}
+
+\RequirePackage{pdfcomment}
+\RequirePackage{xcolor}
+
+\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}
+\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}}
+\FXRegisterLayout*[margin,marginclue,marginnote,pdfmargin,pdfsigmargin]{%
+ pdfcsigmargin}{%
+ \FXLayoutPDFCSigMargin}
+\endinput
+%%
+%% End of file `fxlayoutpdfcsigmargin.sty'.
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
new file mode 100644
index 00000000000..7b5fcad775e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
@@ -0,0 +1,62 @@
+%%
+%% This is file `fxlayoutpdfcsignote.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fixme.dtx (with options: `fxlayoutpdfcsignote')
+%%
+
+
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
+
+%% 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 consists of the files listed in the file `README'.
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\NeedsTeXFormat{LaTeX2e}
+\FXProvidesLayout{pdfcsignote}
+
+\RequirePackage{pdfcomment}
+\RequirePackage{xcolor}
+
+\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}
+\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}}
+\FXRegisterLayout[pdfnote,pdfcnote]{pdfcsignote}{\FXLayoutPDFCSigNote}
+\endinput
+%%
+%% End of file `fxlayoutpdfcsignote.sty'.
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty
new file mode 100644
index 00000000000..1c6cb582e81
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty
@@ -0,0 +1,52 @@
+%%
+%% This is file `fxlayoutpdfmargin.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fixme.dtx (with options: `fxlayoutpdfmargin')
+%%
+
+
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
+
+%% 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 consists of the files listed in the file `README'.
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\NeedsTeXFormat{LaTeX2e}
+\FXProvidesLayout{pdfmargin}
+
+\RequirePackage{pdfcomment}
+
+\newcommand*\FXLayoutPDFMargin[3]{%
+ \pdfmargincomment[author=#3]{\ignorespaces#3 \fxnotename{#1}: #2}}
+\FXRegisterLayout*[margin,marginclue,marginnote]{pdfmargin}{%
+ \FXLayoutPDFMargin}
+\endinput
+%%
+%% End of file `fxlayoutpdfmargin.sty'.
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty
new file mode 100644
index 00000000000..0965f7046fd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty
@@ -0,0 +1,51 @@
+%%
+%% This is file `fxlayoutpdfnote.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fixme.dtx (with options: `fxlayoutpdfnote')
+%%
+
+
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
+
+%% 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 consists of the files listed in the file `README'.
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\NeedsTeXFormat{LaTeX2e}
+\FXProvidesLayout{pdfnote}
+
+\RequirePackage{pdfcomment}
+
+\newcommand*\FXLayoutPDFNote[3]{%
+ \pdfcomment[author=#3]{\ignorespaces#3 \fxnotename{#1}: #2}}
+\FXRegisterLayout{pdfnote}{\FXLayoutPDFNote}
+\endinput
+%%
+%% End of file `fxlayoutpdfnote.sty'.
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty
new file mode 100644
index 00000000000..5eb5e1a6983
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty
@@ -0,0 +1,57 @@
+%%
+%% This is file `fxlayoutpdfsigmargin.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fixme.dtx (with options: `fxlayoutpdfsigmargin')
+%%
+
+
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
+
+%% 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 consists of the files listed in the file `README'.
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\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}}
+\FXRegisterLayout*[margin,marginclue,marginnote,pdfmargin]{pdfsigmargin}{%
+ \FXLayoutPDFSigMargin}
+\endinput
+%%
+%% End of file `fxlayoutpdfsigmargin.sty'.
diff --git a/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty
new file mode 100644
index 00000000000..a19792f7745
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty
@@ -0,0 +1,56 @@
+%%
+%% This is file `fxlayoutpdfsignote.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% fixme.dtx (with options: `fxlayoutpdfsignote')
+%%
+
+
+%% Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Didier Verna
+%% Copyright (C) 2007, 2009 Didier Verna
+
+%% 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 consists of the files listed in the file `README'.
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\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}}
+\FXRegisterLayout[pdfnote]{pdfsignote}{\FXLayoutPDFSigNote}
+\endinput
+%%
+%% End of file `fxlayoutpdfsignote.sty'.
diff --git a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
index d0b7fa4ee7d..fe10dda83b0 100644
--- a/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
+++ b/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
@@ -50,7 +50,7 @@
\renewcommand*\FXLayoutFootnote[3]{%
\@fxdocolon{#3}%
- \footnote{\color{fx#1}\ignorespaces#3\@fxcolon #2}}
+ \footnote{\color{fx#1}\ignorespaces#3\@fxcolon#2}}
\renewcommand*\FXLayoutMargin[3]{%
\@fxdocolon{#3}%
\marginpar[%