summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fixme/fixme.sty
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/fixme.sty
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/fixme.sty')
-rw-r--r--Master/texmf-dist/tex/latex/fixme/fixme.sty73
1 files changed, 40 insertions, 33 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{%