texlive[43413] Master/texmf-dist: fixme (6mar17)
commits+karl at tug.org
commits+karl at tug.org
Mon Mar 6 22:58:12 CET 2017
Revision: 43413
http://tug.org/svn/texlive?view=revision&revision=43413
Author: karl
Date: 2017-03-06 22:58:12 +0100 (Mon, 06 Mar 2017)
Log Message:
-----------
fixme (6mar17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/fixme/NEWS
trunk/Master/texmf-dist/doc/latex/fixme/THANKS
trunk/Master/texmf-dist/doc/latex/fixme/fixme.el
trunk/Master/texmf-dist/doc/latex/fixme/fixme.pdf
trunk/Master/texmf-dist/doc/latex/fixme/header.inc
trunk/Master/texmf-dist/source/latex/fixme/fixme.dtx
trunk/Master/texmf-dist/source/latex/fixme/fixme.ins
trunk/Master/texmf-dist/tex/latex/fixme/fixme.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty
trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty
trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty
trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/fixme/README.md
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/fixme/README
Modified: trunk/Master/texmf-dist/doc/latex/fixme/NEWS
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fixme/NEWS 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/doc/latex/fixme/NEWS 2017-03-06 21:58:12 UTC (rev 43413)
@@ -7,17 +7,22 @@
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'.
+FiXme consists of the files listed in the file `README.md'.
+* Version 4.4
+** Handle existing yet empty lox files properly
+meaning, don't actually typeset an empty list of corrections.
+** Don't update the lox file in final mode
+avoiding potential typesetting artifacts, reported by Lars Madsen.
+** Various internals and documentation improvements.
+
* Version 4.3
** Add a paragraph about the duplication of notes in captions
upon exchange with Kreuvf.
Deleted: trunk/Master/texmf-dist/doc/latex/fixme/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fixme/README 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/doc/latex/fixme/README 2017-03-06 21:58:12 UTC (rev 43413)
@@ -1,82 +0,0 @@
- ABOUT FIXME
-
-
-Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna
-
-Author: Didier Verna <didier at didierverna.net>
-
-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 following files:
-
-- README (this file)
-- NEWS
-- fixme.ins
-- fixme.dtx
-- fixme.el
-- THANKS
-
-
-* Description
-
-FiXme is a collaborative annotation tool for LaTeX documents. Annotating a
-document refers here to inserting meta-notes, that is, notes that do not
-belong to the document itself, but rather to its development or reviewing
-process. Such notes may involve things of different importance levels, ranging
-from simple "fix the spelling" flags to critical "this paragraph is a lie"
-mentions. Annotations like this should be visible during the development or
-reviewing phase, but should normally disapear in the final version of the
-document.
-
-FiXme is designed to ease and automate the process of managing collaborative
-annotations, by offering a set of predefined note levels and layouts, the
-possibility to register multiple note authors, to reference annotations by
-listing and indexing etc. FiXme is extensible, giving you the possibility to
-create new layouts or even complete "themes", and also comes with support for
-AUC-TeX.
-
-FiXme homepage: http://www.lrde.epita.fr/~didier/software/latex.php#fixme
-
-
-* Installation
-
-If you are building FiXme from the tarball you need to execute the following
-steps in order to extract the necessary files. FiXme also requires the DoX
-package (version 2.0, release date 2009/09/21 or later), to build. It is not
-required to use the paclage.
-
-[pdf]latex fixme.ins
-[pdf]latex fixme.dtx
-[pdf]latex fixme.dtx
-makeindex -s gind fixme.idx
-[pdf]latex fixme.dtx
-[pdf]latex fixme.dtx
-
-After that, you need to install the generated documentation and style files to
-a location where LATEX can find them. For a TDS-compliant layout, the
-following locations are suggested:
-
-[TEXMF]/tex/latex/fixme/fixme.sty
-[TEXMF]/tex/latex/fixme/layouts/fxlayout*.sty
-[TEXMF]/tex/latex/fixme/layouts/env/fxenvlayout*.sty
-[TEXMF]/tex/latex/fixme/layouts/target/fxtargetlayout*.sty
-[TEXMF]/tex/latex/fixme/themes/fxtheme*.sty
-[TEXMF]/doc/latex/fixme/fixme.[pdf|dvi]
-
-If you're an AUC-TeX user, you may also install the file 'fixme.el' in a
-suitable AUC-TeX style directory.
-
-
-
-
-Local Variables:
-mode: outline
-End:
Added: trunk/Master/texmf-dist/doc/latex/fixme/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fixme/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/fixme/README.md 2017-03-06 21:58:12 UTC (rev 43413)
@@ -0,0 +1,74 @@
+ABOUT FIXME
+===========
+
+Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna
+
+Author: Didier Verna <didier at didierverna.net>
+
+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.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 following files:
+
+- README.md (this file)
+- NEWS
+- fixme.ins
+- fixme.dtx
+- fixme.el
+- THANKS
+
+
+Description
+-----------
+FiXme is a collaborative annotation tool for LaTeX documents. Annotating a
+document refers here to inserting meta-notes, that is, notes that do not
+belong to the document itself, but rather to its development or reviewing
+process. Such notes may involve things of different importance levels, ranging
+from simple "fix the spelling" flags to critical "this paragraph is a lie"
+mentions. Annotations like this should be visible during the development or
+reviewing phase, but should normally disappear in the final version of the
+document.
+
+FiXme is designed to ease and automate the process of managing collaborative
+annotations, by offering a set of predefined note levels and layouts, the
+possibility to register multiple authors, to reference annotations by listing
+and indexing etc. FiXme is extensible, giving you the possibility to create
+new layouts or even complete "themes", and also comes with support
+for [AUC-TeX](https://www.gnu.org/software/auctex/).
+
+FiXme homepage: http://www.lrde.epita.fr/~didier/software/latex.php#fixme
+
+
+Installation
+------------
+If you are building FiXme from the tarball you need to execute the following
+steps in order to extract the necessary files. FiXme also requires
+the [DoX](https://www.lrde.epita.fr/~didier/software/latex.php#dox) package
+(version 2.0, release date 2009/09/21 or later), to build. It is not required
+to use the package.
+
+ [pdf]latex fixme.ins
+ [pdf]latex fixme.dtx
+ [pdf]latex fixme.dtx
+ makeindex -s gind fixme.idx
+ [pdf]latex fixme.dtx
+ [pdf]latex fixme.dtx
+
+After that, you need to install the generated documentation and style files to
+a location where LaTeX can find them. For a TDS-compliant layout, the
+following locations are suggested:
+
+ [TEXMF]/tex/latex/fixme/fixme.sty
+ [TEXMF]/tex/latex/fixme/layouts/fxlayout*.sty
+ [TEXMF]/tex/latex/fixme/layouts/env/fxenvlayout*.sty
+ [TEXMF]/tex/latex/fixme/layouts/target/fxtargetlayout*.sty
+ [TEXMF]/tex/latex/fixme/themes/fxtheme*.sty
+ [TEXMF]/doc/latex/fixme/fixme.[pdf|dvi]
+
+If you're an AUC-TeX user, you may also install the file `fixme.el` in a
+suitable AUC-TeX style directory.
Modified: trunk/Master/texmf-dist/doc/latex/fixme/THANKS
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fixme/THANKS 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/doc/latex/fixme/THANKS 2017-03-06 21:58:12 UTC (rev 43413)
@@ -7,15 +7,13 @@
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'.
+FiXme consists of the files listed in the file `README.md'.
* Contributors
Modified: trunk/Master/texmf-dist/doc/latex/fixme/fixme.el
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fixme/fixme.el 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/doc/latex/fixme/fixme.el 2017-03-06 21:58:12 UTC (rev 43413)
@@ -1,31 +1,24 @@
;;; fixme.el --- AUC-TeX style file for FiXme
-;; Copyright (C) 2000, 2002, 2004, 2006, 2009 Didier Verna
+;; Copyright (C) 2000, 2002, 2004, 2006, 2009, 2017 Didier Verna
;; Author: Didier Verna <didier at didierverna.net>
-;; Created: Tue Apr 18 14:49:29 2000
;; Keywords: tex abbrev data
-
;; 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 all files listed in the file `README'.
+;; FiXme consists of all files listed in the file `README.md'.
;;; Commentary:
-;; Contents management by FCM version 0.1.
-
-
;;; Code:
(TeX-add-style-hook "fixme"
Modified: trunk/Master/texmf-dist/doc/latex/fixme/fixme.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fixme/header.inc
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fixme/header.inc 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/doc/latex/fixme/header.inc 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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,7 +35,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{fixme}[2017/01/18 v4.3 Collaborative annotations for LaTeX2e]
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{fixme}[2017/03/05 v4.4 Collaborative annotations for LaTeX2e]
\newcommand\fixmelogo{\textsf{FiXme}}
Modified: trunk/Master/texmf-dist/source/latex/fixme/fixme.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fixme/fixme.dtx 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/source/latex/fixme/fixme.dtx 2017-03-06 21:58:12 UTC (rev 43413)
@@ -8,15 +8,13 @@
%
% 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'.
+% FiXme consists of the files listed in the file `README.md'.
%
%
% Commentary:
@@ -63,7 +61,7 @@
%
% \fi
%
-% \CheckSum{1761}
+% \CheckSum{1719}
% \GetFileInfo{fixme.inc}
%% \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
@@ -118,7 +116,7 @@
% \newcommand\ie{\textit{i.e.}\xspace}
% \newcommand\komascript{\textsc{Koma}-Script\xspace}
% \newcommand\auctex{AUC-\TeX\xspace}
-% \newcommand\emacs{\textsf{[X]Emacs}\xspace}
+% \newcommand\emacs{\textsf{Emacs}\xspace}
%
% \newcommand\fx{\fixmelogo\xspace}
% \newcommand\packagecopyright{%
@@ -151,7 +149,7 @@
%
% \fx is designed to ease and automate the process of managing collaborative
% annotations, by offering a set of predefined note levels and layouts, the
-% possibility to register multiple note authors, to reference annotations by
+% possibility to register multiple authors, to reference annotations by
% listing and indexing \etc \fx is extensible, giving you the possibility to
% create new layouts or even complete ``themes'', and also comes with
% support for \auctex.
@@ -291,12 +289,11 @@
% \DescribeMacro{\fxwarning*}
% \DescribeMacro{\fxerror*}
% \DescribeMacro{\fxfatal*}\oarg{options}\marg{note}\marg{text}\\
-% Sometimes, you might not only want to issue a \fx note, but also
-% highlight the relevant part of the text to which it applies. This is what I
-% call ``targeting'' the note. As of version 4, \fx provides starred
-% versions of its annotation commands to do that. In star form, these
-% commands expect an additional mandatory argument containing the text to be
-% highlighted.
+% Sometimes, you might not only want to issue a \fx note, but also highlight
+% the relevant part of the text to which it applies. This is what I call
+% ``targeting'' the annotation. As of version 4, \fx provides starred versions
+% of its annotation commands to do that. In star form, these commands expect
+% an additional mandatory argument containing the text to be highlighted.
%
% \subsubsection{Environments}
% \begin{quotation}\itshape
@@ -314,9 +311,8 @@
% every note level. These environments take one mandatory argument (meant to
% be a short summary of the long note) and behave in exactly the same way as
% their command counterpart. The layout policy is a bit different though (see
-% section
-% \sectionref{sec:manual:layout}): the environment's contents will always
-% appear inline, and the \meta{summary} will obey all active annotation
+% section \sectionref{sec:manual:layout}): the environment's contents will
+% always appear inline, and the \meta{summary} will obey all active annotation
% layouts except for the \texttt{inline} one, just as if it had been passed to
% one of the \fx annotation commands described in the previous section.
% \begin{quotation}\itshape
@@ -403,7 +399,7 @@
% environment. There are some restrictions on their usage however, as
% discussed in the next section.
%
-% To activate a note layout, use the option alone or give it a value of
+% To activate a layout, use the option alone or give it a value of
% \texttt{true}. For instance, these two forms are equivalent:
% \begin{verbatim}
% \fxnote[inline]{note...}
@@ -539,7 +535,7 @@
% you try to activate both, only the most recently activated one will be
% enabled (and you'll get a notice in the log file and on the terminal).
%
-% \paragraph{\texttt{marginnote}}
+% \paragraph{\texttt{marginnote}}\label{sec:manual:marginnote}
% \DescribeBooleanOption{marginnote}
% \DescribeLayout[noprint]{marginnote}
% The \texttt{marginnote} layout is an alternate (external) way to display
@@ -552,6 +548,11 @@
% currently possible to pass options to the \cs{marginnote} command through
% this layout.
%
+% For a reasonably robust marginal layout accross all annotations, including
+% those issued in floats, consider using \texttt{marginnote} in conjunction
+% with \texttt{innerlayout=noinline} (see
+% section \sectionref{sec:manual:inner}).
+%
% \paragraph{PDF comments}
% \DescribeBooleanOption{pdfnote}
% \DescribeLayout[noprint]{pdfnote}
@@ -584,7 +585,7 @@
% annotation's importance level). They also avoid printing the annotation's
% level since this information is already conveyed by the color.
%
-% \subsubsection{Inner layout}
+% \subsubsection{Inner layout}\label{sec:manual:inner}
% There might be various reasons for you to change the layout locally for one
% particular annotation: creating a floating one is an example, see also
% section \sectionref{sec:manual:othercommonproblems} for some others. One
@@ -602,7 +603,7 @@
% addition to that, \fx automatically disables the \texttt{margin} and
% \texttt{marginclue} layouts. If you really want to use marginal paragraphs
% in inner mode, a good idea is then to set your inner layout to
-% \texttt{marginnote} (see the previous section).
+% \texttt{marginnote} (see section \ref{sec:manual:marginnote}).
%
% Using \texttt{innerlayout} is not as trivial as it may seem: it
% \emph{really} is an alternative layout configuration, and as such, you can
@@ -708,9 +709,9 @@
% \texttt{thepage}, which as you guessed means to use the page number.
%
% The name "target" bears an intentional resemblance to \fx's targeted
-% commands and environments, because we are indeed targetting the note to
-% something. The only difference is that in the case of floating annotations,
-% the target is non-textual.
+% commands and environments, because we are indeed targetting the annotation
+% to something. The only difference is that in the case of floating
+% annotations, the target is non-textual.
%
% Here is an example of a floating annotation that would typically appear in
% the document's preamble:
@@ -1029,8 +1030,8 @@
% \subsubsection{Language tracking}
% \DescribeOption{langtrack}
% If the document you're working on has parts written in different languages,
-% it might be the case that \fx notes should follow the current language as
-% well (especially if you're in collaborative mode; see section
+% it might be the case that the annotations should follow the current language
+% as well (especially if you're in collaborative mode; see section
% \sectionref{sec:manual:modes}). \fx provides a boolean option named
% \texttt{langtrack}. When specified, \fx assumes that you're using
% \texttt{babel} and automatically switches to the current language (as
@@ -1049,10 +1050,10 @@
% precedence over the language tracking behavior.
%
% \subsubsection{Indexing in different languages}
-% If your document contains \fx notes written in different languages, and
-% you have requested the \texttt{index} layout, \fx will not only classify
-% the notes by their level of importance, but also by language. For example,
-% if you have \fx warnings in both English and French, you will find two
+% If your document contains annotations written in different languages, and
+% you have requested the \texttt{index} layout, \fx will not only classify the
+% notes by their level of importance, but also by language. For example, if
+% you have \fx warnings in both English and French, you will find two
% different subcategories for warnings in the index: one called ``Warnings''
% and one called ``Avertissements''.
%
@@ -1175,8 +1176,8 @@
% locally by the annotation commands or environments.
%
% When collaborative mode is active, \fx adjusts the list of fixmes layout to
-% display the authors tags as well. Additionally, \fx notes are indexed as
-% before, but additional index entries, sorted by author, are generated as
+% display the authors tags as well. Additionally, the annotations are indexed
+% as before, but additional index entries, sorted by author, are generated as
% well.
%
% \subsection{Themes\label{sec:manual:themes}}
@@ -1252,8 +1253,8 @@
% \DescribeMacro[noprint]{\FXLayoutMarginClue}
% Each annotation layout is implemented as a macro taking three mandatory
% arguments. By convention, this macro is named \cs{FXLayout}\meta{name}, for
-% instance \cs{FXLayoutInline}.\meta{type} is the note type. It can be one of
-% \texttt{note}, \texttt{warning}, \texttt{error} and \texttt{fatal}.
+% instance \cs{FXLayoutInline}.\meta{type} is the annotation type. It can be
+% one of \texttt{note}, \texttt{warning}, \texttt{error} and \texttt{fatal}.
% \meta{annotation} is the annotation itself, and \meta{author} is the
% author's tag.
%
@@ -1273,10 +1274,9 @@
% arguments. By convention, these macros are named
% \cs{FXEnvLayout}\meta{name}\texttt{Begin} and
% \cs{FXEnvLayout}\meta{name}\texttt{End}, for instance
-% \cs{FXEnvLayoutPlainBegin} and \cs{FXEnvLayoutPlainEnd}.
-% \meta{type} is the note type. It can be one of \texttt{note},
-% \texttt{warning}, \texttt{error} and \texttt{fatal}. \meta{author} is the
-% author's tag.
+% \cs{FXEnvLayoutPlainBegin} and \cs{FXEnvLayoutPlainEnd}. \meta{type} is
+% the annotation type. It can be one of \texttt{note}, \texttt{warning},
+% \texttt{error} and \texttt{fatal}. \meta{author} is the author's tag.
% \end{sloppypar}
%
% \subsubsection{Modifying existing target layouts}
@@ -1285,9 +1285,9 @@
% \DescribeMacro[noprint]{\FXTargetLayoutColor}
% Each target layout is implemented as a macro taking two mandatory arguments.
% By convention, this macro is named \cs{FXTargetLayout}\meta{name}, for
-% instance \cs{FXTargetLayoutPlain}. \meta{type} is the note type. It can be
-% one of \texttt{note}, \texttt{warning}, \texttt{error} and \texttt{fatal}.
-% \meta{target} is the textual target.
+% instance \cs{FXTargetLayoutPlain}. \meta{type} is the annotation type. It
+% can be one of \texttt{note}, \texttt{warning}, \texttt{error} and
+% \texttt{fatal}. \meta{target} is the textual target.
%
% \subsection{Creating new layouts}
% Creating a new layout first requires that you write new layout macros as
@@ -1474,7 +1474,7 @@
% \sectionref{sec:manual:i18n}. For every supported language \meta{lang}, a
% number of macros define the language-dependent part of \fx. The commands
% \cs{fx}\meta{lang}\texttt{notename}, \cs{fx}\meta{lang}\texttt{notesname},
-% and their equivalent for the other note levels define the singular and
+% and their equivalent for the other annotation levels define the singular and
% plural forms of the note names.\\
% \DescribeMacro[noindex]{\...listfixmename}
% \DescribeMacro[noprint]{\englishlistfixmename}
@@ -1493,6 +1493,11 @@
%
% \section{History\label{sec:manual:history}}
% \begin{itemize}
+% \item[v4.4] Handle existing yet empty lox file properly, meaning don't
+% actually typeset an empty list of corrections.\\
+% Don't update the \texttt{lox} file in final mode, avoiding potential
+% typesetting artifacts, reported by Lars Madsen.\\
+% Various internals and documentation improvements.
% \item[v4.3] Add a paragraph about the duplication of notes in captions, upon
% exchange with Kreuvf.\\
% Update support for the \komascript classes by using the
@@ -1578,9 +1583,10 @@
% \section{Implementation}
% \subsection{Preamble}
% \begin{macrocode}
-%<fixme>\NeedsTeXFormat{LaTeX2e}
+%<fixme>
+\NeedsTeXFormat{LaTeX2e}
%<*header>
-\ProvidesPackage{fixme}[2017/01/18 v4.3 Collaborative annotations for LaTeX2e]
+\ProvidesPackage{fixme}[2017/03/05 v4.4 Collaborative annotations for LaTeX2e]
%</header>
% \end{macrocode}
@@ -1594,7 +1600,7 @@
%</fixme>
% \end{macrocode}
% \begin{macro}{\fixmelogo}
-% The \fx logo:
+% The \fx logo:
% \begin{macrocode}
%<*header>
\newcommand\fixmelogo{\textsf{FiXme}}
@@ -1607,8 +1613,8 @@
% \subsubsection{Miscellaneous}
% \begin{macro}{\@fxpkginfo}
% \begin{macro}{\@fxpkgwarning}
-% \marg{msg}\\
-% Issue a \fx package info or warning:
+% \marg{msg}\\
+% Issue a \fx package info or warning:
% \begin{macrocode}
%<*fixme>
\newcommand\@fxpkginfo{\PackageInfo{FiXme}}
@@ -1617,8 +1623,8 @@
% \end{macro}
% \end{macro}
% \begin{macro}{\@fxpkgerror}
-% \marg{shortmsg}\marg{longmsg}\\
-% Issue a \fx package error:
+% \marg{shortmsg}\marg{longmsg}\\
+% Issue a \fx package error:
% \begin{macrocode}
\newcommand\@fxpkgerror{\PackageError{FiXme}}
@@ -1625,9 +1631,9 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxaddtolist}
-% \marg{list}\marg{elt}\\
-% Add \meta{elt} at the end of \meta{list}. We should check for duplicates,
-% but this is not currently done.
+% \marg{list}\marg{elt}\\
+% Add \meta{elt} at the end of \meta{list}. We should check for duplicates,
+% but this is not currently done.
% \begin{macrocode}
\newcommand*\@fxaddtolist[2]{%
\expandafter\ifx\csname #1\endcsname\relax%
@@ -1642,22 +1648,54 @@
% \end{macrocode}
% \end{macro}
-% \subsubsection{\texttt{xkeyval} related}
+% \subsubsection{Key-value management (\texttt{xkeyval})}
+% \paragraph{Shortcuts}
+% The following macros are simple shortcuts for using \texttt{xkeyval} with
+% the \texttt{fx} prefix.
% \begin{macro}{\@fxkeyifundefined}
-% \marg{families}\marg{keys}\marg{then}\marg{else}
+% \marg{families}\marg{key}\marg{then}\marg{else}
% \begin{macrocode}
\newcommand\@fxkeyifundefined{\key at ifundefined[fx]}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxdefinekey}
-% \marg{family}\marg{key}\oarg{default}\marg{function}
+% \marg{family}\marg{key}\oarg{default}\marg{function}
% \begin{macrocode}
\newcommand\@fxdefinekey{\define at key[fx]}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\@fxdefinecmdkey}
+% \marg{family}\oarg{mp}\marg{key}\oarg{default}\marg{function}
+% \begin{macrocode}
+\newcommand\@fxdefinecmdkey{\define at cmdkey[fx]}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@fxdefinechoicekey}
+% \marg{family}\marg{key}\oarg{bin}\marg{alternatives}\ignorespaces
+% \oarg{default}\marg{function}
+% \begin{macrocode}
+\newcommand\@fxdefinechoicekey{\define at choicekey[fx]}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@fxsetkeys}
+% \marg{families}\oarg{na}\marg{keys}
+% \begin{macrocode}
+\newcommand\@fxsetkeys{\setkeys[fx]}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@fxpresetkeys}
+% \marg{families}\marg{head keys}\marg{tail keys}
+% \begin{macrocode}
+%% Note: currently unused
+%% \newcommand\@fxpresetkeys{\presetkeys[fx]}
+
+% \end{macrocode}
+% \end{macro}
+%
+% \paragraph{Wrappers}
% \begin{macro}{\@fxvoidkeyerror}
-% \marg{key}\marg{value}\\
-% Issue a \fx error about a void key misuse (see below):
+% \marg{key}\marg{value}\\
+% Issue a \fx error about a void key misuse (see below):
% \begin{macrocode}
\newcommand*\@fxvoidkeyerror[2]{%
\@fxpkgerror{misuse of key '#1'}{%
@@ -1667,9 +1705,9 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxdefinevoidkey}
-% \marg{family}\marg{name}\marg{func}\\
-% A \fx ``void key'' is an \texttt{xkeyval} key that doesn't expect any
-% argument.
+% \marg{family}\marg{name}\marg{func}\\
+% A \fx ``void key'' is an \texttt{xkeyval} key that doesn't expect any
+% argument.
% \begin{macrocode}
\newcommand*\@fxdefinevoidkey[3]{%
\define at key[fx]{#1}{#2}[]{%
@@ -1680,10 +1718,10 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxdefineboolkey}
-% \oarg{func}\marg{family}\marg{name}\\
-% A \fx ``boolean key'' is like an \texttt{xkeyval} one, with the
-% addition that for every such \texttt{key}, there is a \texttt{nokey} void
-% key counterpart.
+% \oarg{func}\marg{family}\marg{name}\\
+% A \fx ``boolean key'' is like an \texttt{xkeyval} one, with the
+% addition that for every such \texttt{key}, there is a \texttt{nokey} void
+% key counterpart.
% \begin{macrocode}
\newcommand*\@fxdefineboolkey[3][]{%
\define at boolkey[fx]{#2}{#3}[true]{#1}
@@ -1691,34 +1729,6 @@
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\@fxdefinecmdkey}
-% \marg{family}\oarg{mp}\marg{key}\oarg{default}\marg{function}
-% \begin{macrocode}
-\newcommand\@fxdefinecmdkey{\define at cmdkey[fx]}
-
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\@fxdefinechoicekey}
-% \marg{family}\marg{key}\oarg{bin}\marg{alternatives}\ignorespaces
-% \oarg{default}\marg{function}
-% \begin{macrocode}
-\newcommand\@fxdefinechoicekey{\define at choicekey[fx]}
-
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\@fxsetkeys}
-% \marg{families}\oarg{na}\marg{keys}
-% \begin{macrocode}
-\newcommand\@fxsetkeys{\setkeys[fx]}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\@fxpresetkeys}
-% \marg{families}\marg{head keys}\marg{tail keys}
-% \begin{macrocode}
-%% Note: currently unused
-%% \newcommand\@fxpresetkeys{\presetkeys[fx]}
-% \end{macrocode}
-% \end{macro}
%
% \subsection{List macros}
% \subsubsection{Contents lines\label{sec:code:contentsline}}
@@ -1849,22 +1859,28 @@
% \subsubsection{Status/class-dependent implementation}
% \begin{macro}{\lox at final}
% \begin{macro}{\lox at draft}
-% In order to prevent the List of Fixme's heading from being generated when
-% there are no \fx notes, a test on the existence of the \texttt{lox} file
-% is performed. There's a slight bug left however: after removing the last
-% fixme note, one ends up with an empty \texttt{lox} file, so the heading
-% still appears. Previously, this was done by checking if some \fx notes
-% were given, but that was buggy: the List of Fixme's could not appear
-% before the first fixme note\ldots I should try to detect whether the file
-% is empty.
+% In the new implementation of the \texttt{draft} mode below, we not only
+% check that the \texttt{lox} file exists, but also that it is not empty
+% before actually typesetting anything.
% \begin{macrocode}
\let\lox at final\relax
+
+\newread\lox at file
+\newif\iflox at typeset
+\def\lox at eol{\par}
\newcommand\lox at draft{%
- \IfFileExists{\jobname .lox}{%
- \@lox at prtc%
- \@starttoc{lox}%
- \@lox at psttc}{%
- \@starttoc{lox}}}
+ \lox at typesetfalse%
+ \openin\lox at file\jobname.lox\relax
+ \ifeof\lox at file\else
+ \read\lox at file to \lox at maybeeol
+ \ifeof\lox at file
+ \ifx\lox at maybeeol\lox at eol\else\lox at typesettrue\fi
+ \else
+ \lox at typesettrue
+ \fi
+ \fi
+ \closein\lox at file
+ \iflox at typeset\@lox at prtc\@starttoc{lox}\@lox at psttc\else\@starttoc{lox}\fi}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1903,6 +1919,7 @@
% \end{macro}
%
% \subsection{Annotation layouts}
+% \subsubsection{Layout modes}
% \begin{option}{multiuser}
% \begin{option}{singleuser}
% \begin{option}{mode}
@@ -2013,8 +2030,33 @@
% \end{macro}
% \end{macro}
%
+% \subsubsection{Standard textual dispositions}
+% \begin{macro}{\@fxtextstd}
+% \marg{type}\marg{note}\marg{author}\\
+% The standard text disposition.
+% \begin{macrocode}
+\newcommand*\@fxtextstd[3]{\ignorespaces#3 \fxnotename{#1}: #2}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@fxsignature}
+% \marg{author}\\
+% Typeset the signature part unless \meta{author} is empty. Note that
+% \cs{ifthenelse} is fragile, so we need to make the signature stuff robust.
+% \begin{macrocode}
+\DeclareRobustCommand*\@fxsignature[1]{%
+ \ifthenelse{\equal{#1}{}}{}{ -- {\@fxuseface{signature}#1}}}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@fxsigstd}
+% \marg{type}\marg{note}\marg{author}\\
+% The standard signature disposition.
+% \begin{macrocode}
+\newcommand*\@fxsigstd[3]{\fxnotename{#1}: #2\@fxsignature{#3}}
+% \end{macrocode}
+% \end{macro}
+%
% \subsubsection{Built-in layouts}
-% Let's deal start with the early layouts, and continue with the late ones.
+% Let's start with the early layouts, and continue with the late ones.
% \paragraph{Margin}
% \begin{layout}[noprint]{margin}
% \begin{face}{margin}
@@ -2027,9 +2069,8 @@
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
\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}}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at margin}
@@ -2068,8 +2109,7 @@
% \begin{macro}{\FXLayoutFootnote}
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
-\newcommand*\FXLayoutFootnote[3]{%
- \footnote{\ignorespaces#3 \fxnotename{#1}: #2}}
+\newcommand*\FXLayoutFootnote[3]{\footnote{\@fxtextstd{#1}{#2}{#3}}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at footnote}
@@ -2093,8 +2133,7 @@
% \begin{macro}{\FXLayoutInline}
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
-\newcommand*\FXLayoutInline[3]{%
- { \@fxuseface{inline}\ignorespaces#3 \fxnotename{#1}: #2}}
+\newcommand*\FXLayoutInline[3]{ \@fxuseface{inline}\@fxtextstd{#1}{#2}{#3}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at inline}
@@ -2133,7 +2172,7 @@
% \begin{macro}{\@fxwarningkey}
% \begin{macro}{\@fxerrorkey}
% \begin{macro}{\@fxfatalkey}
-% The keys used to sort indexed \fx notes by importance level:
+% The keys used to sort indexed annotations by importance level:
% \begin{macrocode}
\newcommand\@fxnotekey{***a}
\newcommand\@fxwarningkey{***b}
@@ -2173,14 +2212,16 @@
% \end{layout}
%
% \paragraph{Contents line\label{sec:code:contentslinelayout}}
+% The contents of the \texttt{lox} file is handled through this
+% pseudo-layout. It follows the normal layout design, but is not registered
+% the usual way because we don't want to give the user control over it. It is
+% triggered explicitely by \cs{@@@fxnote at late@draft}.
% \begin{macro}{\FXLayoutContentsLine}
% \marg{type}\marg{note}\marg{author}\\
-% This one is not registered like the others because it is always active and
-% used explicitely by the \texttt{lox} code.
% \begin{macrocode}
\newcommand*\FXLayoutContentsLine[3]{%
\iffx at mode@multiuser%
- \fxaddcontentsline{\ignorespaces#3 \fxnotename{#1}: #2}%
+ \fxaddcontentsline{\@fxtextstd{#1}{#2}{#3}}%
\else%
\fxaddcontentsline{\fxnotename{#1}: #2}%
\fi}
@@ -2335,17 +2376,6 @@
\@fxnewface[\itshape]{signature}
% \end{macrocode}
% \end{face}
-% \begin{macro}{\@fxdosig}
-% \marg{author}
-% \begin{macro}{\@fxsignature}
-% Use a signature of the form ``-- sig'', unless author is empty.
-% \begin{macrocode}
-\newcommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
% \begin{macro}{\FXEnvLayoutSignatureBegin}
% \begin{macro}{\FXEnvLayoutSignatureEnd}
% \marg{type}\marg{author}
@@ -2352,7 +2382,7 @@
% \begin{macrocode}
\newcommand*\FXEnvLayoutSignatureBegin[2]{%
\@fxuseface{env}\fxnotename{#1}: \ignorespaces}
-\newcommand*\FXEnvLayoutSignatureEnd[2]{\@fxdosig{#2}\@fxsignature}
+\newcommand*\FXEnvLayoutSignatureEnd[2]{\@fxsignature{#2}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2574,9 +2604,9 @@
% \begin{macro}{\@fxlog at fatal}
% In order for the generic note dispatcher to be able to call the logging
% macros (see section \sectionref{sec:code:lowlevelcmd}), we need an easier
-% translation mechanism from the note type to the actual macro name. The
-% translation macros in question can't be \cs{let} to the real one, because
-% users might want to redefine the actual log macros later.
+% translation mechanism from the annotation type to the actual macro
+% name. The translation macros in question can't be \cs{let} to the real
+% one, because users might want to redefine the actual log macros later.
% \begin{macrocode}
\def\@fxlog at note{\FXLogNote}
\def\@fxlog at warning{\FXLogWarning}
@@ -2591,7 +2621,7 @@
%
% \subsubsection{Logging control}
% \begin{booleanoption}{silent}
-% Whether to log \fx notes:
+% Whether to log the annotations:
% \begin{macrocode}
\@fxdefineboolkey{log}{silent}
@@ -2605,8 +2635,8 @@
% \begin{counter}{fxwarningcount}
% \begin{counter}{fxerrorcount}
% \begin{counter}{fxfatalcount}
-% \texttt{fixmecount} maintains the total of all notes, regardless
-% of their level. Each note type also gets its own counter:
+% \texttt{fixmecount} maintains the total of all annotations, regardless of
+% their level. Each note type also gets its own counter:
% \begin{macrocode}
\newcounter{fixmecount}
\newcounter{fxnotecount}
@@ -2621,15 +2651,15 @@
% \end{counter}
% \end{counter}
% \begin{option}{author}
-% A \fx note's ``author'' allows to distinguish notes from different persons
-% in collaborative mode.
+% An annotation ``author'' allows to distinguish notes from different
+% persons in collaborative mode.
% \begin{macrocode}
\@fxdefinecmdkey{note}{author}{}
% \end{macrocode}
% \end{option}
% \begin{option}{target}
-% A \fx note's ``target'' may replace the page number in the list of
-% fixmes or in the index (see also section
+% An annotation ``target'' may replace the page number in the list of
+% corrections or in the index (see also section
% \sectionref{sec:code:contentslinelayout}).
% \begin{macrocode}
\@fxdefinecmdkey{note}{target}{}
@@ -2687,16 +2717,16 @@
% \marg{type}\marg{note}\\
% Dispatch all mode-independent layouts (actually, ``layout'' is to be taken
% in a slightly broader sense here). This macro executes all operations that
-% need to be performed regardless of the document status. This includes
-% updating the \texttt{lox} file and logging the annotation. Note that even
-% in \texttt{final} mode, the \texttt{lox} file is updated. This is to
-% maintain a coherent state if the user goes from \texttt{final} to
-% \texttt{draft} or the other way around. In \texttt{final} mode, the list
-% of fixmes does not appears because \cs{listoffixmes} is \cs{let} to
-% \cs{relax}.
+% need to be performed regardless of the document status. This currently
+% means logging the annotations. Previously, this code also updated the
+% \texttt{lox} file, but this could lead to typesetting artifacts even in
+% final mode (because of the whatsit introduced by \cs{write}), which is
+% highly undesirable, and besides, there's no point in keeping that
+% information up to date, since it won't be typeset. So from now on, the
+% contents lines are only generated in \texttt{draft} mode by
+% \cs{@@@fxnote at late@draft}.
% \begin{macrocode}
\newcommand*\@fxissuecommonlayouts[2]{%
- \FXLayoutContentsLine{#1}{#2}{\cmdfx at note@author}%
\iffx at log@silent\else\@nameuse{@fxlog@#1}{#2}\fi}
% \end{macrocode}
@@ -2723,12 +2753,14 @@
\newcommand*\@@@fxnote at late@final[2]{\@fxissuecommonlayouts{#1}{#2}}
% \end{macrocode}
% In \texttt{draft} mode, early work is to dispatch early layouts, while late
-% work is to dispatch both late \emph{and} common layouts.
+% work is to dispatch both late \emph{and} common layouts, and update the
+% \texttt{lox} file.
% \begin{macrocode}
\newcommand*\@@@fxnote at early@draft[2]{%
\@fxissueearlydraftlayouts{#1}{#2}}
\newcommand*\@@@fxnote at late@draft[2]{%
\@fxissuelatedraftlayouts{#1}{#2}%
+ \FXLayoutContentsLine{#1}{#2}{\cmdfx at note@author}%
\@fxissuecommonlayouts{#1}{#2}}
% \end{macrocode}
@@ -2741,7 +2773,7 @@
% \begin{macro}{\@fxpostconfigure}
% This macro is used in \cs{@@fxnote at early} below, after processing user
% options (even when there is none), to postconfigure some aspects of the
-% notes. Currently, this involves two things: setting the author to
+% annotations. Currently, this involves two things: setting the author to
% \cs{fixmelogo} if it still is \texttt{fixme}, and automatically tracking
% the current language if required (note that all other language options
% turn tracking off, meaning that one can override language tracking locally
@@ -2838,10 +2870,11 @@
% \marg{author}\\
% This macro is used at the beginning of every user-level entry point (here
% for notes, and also in the environments section), to preconfigure some
-% aspects of the notes, before possibly processing options. Currently, this
-% only involves presetting the note's author to the one specified in the
-% call to \cs{FXRegisterAuthor}. This however is not done for the built-in
-% \texttt{fixme} author, because this one should honor a global setting.
+% aspects of the annotations, before possibly processing options. Currently,
+% this only involves presetting the note's author to the one specified in
+% the call to \cs{FXRegisterAuthor}. This however is not done for the
+% built-in \texttt{fixme} author, because this one should honor a global
+% setting.
% \begin{macrocode}
\newcommand*\@fxpreconfigure[1]{%
\ifthenelse{\equal{#1}{fixme}}{}{\@fxsetkeys{note}{author=#1}}}
@@ -3605,9 +3638,8 @@
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
\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}}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at marginnote}
@@ -3635,7 +3667,7 @@
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
\newcommand*\FXLayoutPDFNote[3]{%
- \pdfcomment[author={#3}]{\ignorespaces#3 \fxnotename{#1}: #2}}
+ \pdfcomment[author={#3}]{\@fxtextstd{#1}{#2}{#3}}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at pdfnote}
@@ -3663,7 +3695,7 @@
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
\newcommand*\FXLayoutPDFMargin[3]{%
- \pdfmargincomment[author={#3}]{\ignorespaces#3 \fxnotename{#1}: #2}}
+ \pdfmargincomment[author={#3}]{\@fxtextstd{#1}{#2}{#3}}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at pdfmargin}
@@ -3688,24 +3720,11 @@
\RequirePackage{pdfcomment}
% \end{macrocode}
-% \begin{macro}{\@fxdosig}
-% \marg{author}
-% \begin{macro}{\@fxsignature}
-% Use a signature of the form ``-- sig'', unless author is empty.
-% \begin{macrocode}
-\providecommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
% \begin{macro}{\FXLayoutPDFSigNote}
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
\newcommand*\FXLayoutPDFSigNote[3]{%
- \@fxdosig{#3}%
- \pdfcomment[author={#3}]{\fxnotename{#1}: #2\@fxsignature}}
+ \pdfcomment[author={#3}]{\@fxsigstd{#1}{#2}{#3}}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at pdfsignote}
@@ -3729,24 +3748,11 @@
\RequirePackage{pdfcomment}
% \end{macrocode}
-% \begin{macro}{\@fxdosig}
-% \marg{author}
-% \begin{macro}{\@fxsignature}
-% Use a signature of the form ``-- sig'', unless author is empty.
-% \begin{macrocode}
-\providecommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
% \begin{macro}{\FXLayoutPDFSigMargin}
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
\newcommand*\FXLayoutPDFSigMargin[3]{%
- \@fxdosig{#3}%
- \pdfmargincomment[author={#3}]{\fxnotename{#1}: #2\@fxsignature}}
+ \pdfmargincomment[author={#3}]{\@fxsigstd{#1}{#2}{#3}}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at pdfsigmargin}
@@ -3832,8 +3838,8 @@
% \begin{color}{fxwarning}
% \begin{color}{fxerror}
% \begin{color}{fxfatal}
-% Environments use the same colors as the notes themselves because
-% their contents really is a longer note.
+% Environments use the same colors as the notes themselves because their
+% contents really is a longer note.
% \begin{macrocode}
\definecolor{fxnote}{rgb}{0.0000,0.6000,0.0000}
\definecolor{fxwarning}{rgb}{1.0000,0.5490,0.0000}
@@ -3889,8 +3895,8 @@
% \begin{color}{fxwarning}
% \begin{color}{fxerror}
% \begin{color}{fxfatal}
-% Environments use the same colors as the notes themselves because
-% their contents really is a longer note.
+% Environments use the same colors as the notes themselves because their
+% contents really is a longer note.
% \begin{macrocode}
\definecolor{fxnote}{rgb}{0.0000,0.6000,0.0000}
\definecolor{fxwarning}{rgb}{1.0000,0.5490,0.0000}
@@ -3902,24 +3908,11 @@
% \end{color}
% \end{color}
% \end{color}
-% \begin{macro}{\@fxdosig}
-% \marg{author}
-% \begin{macro}{\@fxsignature}
-% Use a signature of the form ``-- sig'', unless author is empty.
-% \begin{macrocode}
-\providecommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
% \begin{macro}{\FXLayoutPDFCSigNote}
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
\newcommand*\FXLayoutPDFCSigNote[3]{%
- \@fxdosig{#3}%
- \pdfcomment[author={#3},color={fx#1}]{#2\@fxsignature}}
+ \pdfcomment[author={#3},color={fx#1}]{#2\@fxsignature{#3}}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at pdfcsignote}
@@ -3948,8 +3941,8 @@
% \begin{color}{fxwarning}
% \begin{color}{fxerror}
% \begin{color}{fxfatal}
-% Environments use the same colors as the notes themselves because
-% their contents really is a longer note.
+% Environments use the same colors as the notes themselves because their
+% contents really is a longer note.
% \begin{macrocode}
\definecolor{fxnote}{rgb}{0.0000,0.6000,0.0000}
\definecolor{fxwarning}{rgb}{1.0000,0.5490,0.0000}
@@ -3961,24 +3954,11 @@
% \end{color}
% \end{color}
% \end{color}
-% \begin{macro}{\@fxdosig}
-% \marg{author}
-% \begin{macro}{\@fxsignature}
-% Use a signature of the form ``-- sig'', unless author is empty.
-% \begin{macrocode}
-\providecommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
% \begin{macro}{\FXLayoutPDFCSigMargin}
% \marg{type}\marg{note}\marg{author}
% \begin{macrocode}
\newcommand*\FXLayoutPDFCSigMargin[3]{%
- \@fxdosig{#3}%
- \pdfmargincomment[author={#3},color={fx#1}]{#2\@fxsignature}}
+ \pdfmargincomment[author={#3},color={fx#1}]{#2\@fxsignature{#3}}}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\@fxlayout at pdfcsigmargin}
@@ -4018,8 +3998,8 @@
% \begin{color}{fxwarning}
% \begin{color}{fxerror}
% \begin{color}{fxfatal}
-% Environments use the same colors as the notes themselves because
-% their contents really is a longer note.
+% Environments use the same colors as the notes themselves because their
+% contents really is a longer note.
% \begin{macrocode}
\definecolor{fxnote}{rgb}{0.0000,0.6000,0.0000}
\definecolor{fxwarning}{rgb}{1.0000,0.5490,0.0000}
@@ -4071,24 +4051,12 @@
\@fxnewface[\itshape]{signature}
% \end{macrocode}
% \end{face}
-% \begin{macro}{\@fxdosig}
-% \marg{author}
-% \begin{macro}{\@fxsignature}
-% Use a signature of the form ``-- sig'', unless author is empty.
-% \begin{macrocode}
-\providecommand*\@fxdosig[1]{%
- \ifthenelse{\equal{#1}{}}{\def\@fxsignature{}}{%
- \def\@fxsignature{ -- {\@fxuseface{signature}#1}}}}
-
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
% \begin{color}{fxnote}
% \begin{color}{fxwarning}
% \begin{color}{fxerror}
% \begin{color}{fxfatal}
-% Environments use the same colors as the notes themselves because
-% their contents really is a longer note.
+% Environments use the same colors as the notes themselves because their
+% contents really is a longer note.
% \begin{macrocode}
\definecolor{fxnote}{rgb}{0.0000,0.6000,0.0000}
\definecolor{fxwarning}{rgb}{1.0000,0.5490,0.0000}
@@ -4107,7 +4075,7 @@
% \marg{type}\marg{author}
% \begin{macrocode}
\newcommand*\FXEnvLayoutColorSigBegin[2]{\@fxuseface{env}\color{fx#1}}
-\newcommand*\FXEnvLayoutColorSigEnd[2]{\@fxdosig{#2}\@fxsignature}
+\newcommand*\FXEnvLayoutColorSigEnd[2]{\@fxsignature{#2}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4230,33 +4198,21 @@
\NeedsTeXFormat{LaTeX2e}
\FXProvidesTheme{signature}
-% \end{macrocode}
-% \cs{@fxdosig} and \cs{@fxsignature} are provided by the \texttt{signature}
-% environment layout.
-% \begin{macrocode}
\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 at 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}%
@@ -4267,8 +4223,7 @@
\fi}
\renewcommand*\FXLayoutContentsLine[3]{%
\iffx at mode@multiuser%
- \@fxdosig{#3}%
- \fxaddcontentsline{\fxnotename{#1}: #2\@fxsignature}%
+ \fxaddcontentsline{\@fxsigstd{#1}{#2}{#3}}%
\else%
\fxaddcontentsline{\fxnotename{#1}: #2}%
\fi}
@@ -4332,8 +4287,6 @@
%
% \subsection{The \texttt{colorsig} theme}
% \begin{theme}{colorsig}
-% The \texttt{colorsig} environment layout provides \cs{@fxdosig}, so there
-% is no need to provide it here.
% \begin{macrocode}
%<*fxthemecolorsig>
\NeedsTeXFormat{LaTeX2e}
@@ -4346,27 +4299,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 at 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}}%
@@ -4377,8 +4323,7 @@
\fi}
\renewcommand*\FXLayoutContentsLine[3]{%
\iffx at mode@multiuser%
- \@fxdosig{#3}%
- \fxaddcontentsline{\color{fx#1}#2\@fxsignature}%
+ \fxaddcontentsline{\color{fx#1}#2\@fxsignature{#3}}%
\else%
\fxaddcontentsline{\color{fx#1}#2}%
\fi}
Modified: trunk/Master/texmf-dist/source/latex/fixme/fixme.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/fixme/fixme.ins 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/source/latex/fixme/fixme.ins 2017-03-06 21:58:12 UTC (rev 43413)
@@ -6,15 +6,13 @@
%% 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'.
+%% FiXme consists of the files listed in the file `README.md'.
%%% Commentary:
@@ -32,13 +30,11 @@
^^J^^J
Copyright (C) 1998-2002, 2004-2007, 2009, 2013, 2017 Didier Verna^^J
This file is part of FiXme.^^J
-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.^^J
+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.^^J
FiXme consists of the files listed in the file `README'.^^J
\endpreamble
Modified: trunk/Master/texmf-dist/tex/latex/fixme/fixme.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/fixme.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/fixme.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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 at ifundefined[fx]}
\newcommand\@fxdefinekey{\define at key[fx]}
+\newcommand\@fxdefinecmdkey{\define at cmdkey[fx]}
+\newcommand\@fxdefinechoicekey{\define at 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 at boolkey[fx]{#2}{#3}[true]{#1}
\@fxdefinevoidkey{#2}{no#3}{\@nameuse{fx@#2@#3}{false}}}
-\newcommand\@fxdefinecmdkey{\define at cmdkey[fx]}
-
-\newcommand\@fxdefinechoicekey{\define at choicekey[fx]}
-
-\newcommand\@fxsetkeys{\setkeys[fx]}
-%% Note: currently unused
-%% \newcommand\@fxpresetkeys{\presetkeys[fx]}
\let\l at fixme\l at figure
\newcommand*\@fxdottedtocline[5]{%
\ifnum #1>\c at tocdepth \else
@@ -139,12 +137,23 @@
\newcommand\@lox at psttc@book{\if at restonecol\twocolumn\fi}
\let\lox at final\relax
+
+\newread\lox at file
+\newif\iflox at typeset
+\def\lox at eol{\par}
\newcommand\lox at draft{%
- \IfFileExists{\jobname .lox}{%
- \@lox at prtc%
- \@starttoc{lox}%
- \@lox at psttc}{%
- \@starttoc{lox}}}
+ \lox at typesetfalse%
+ \openin\lox at file\jobname.lox\relax
+ \ifeof\lox at file\else
+ \read\lox at file to \lox at maybeeol
+ \ifeof\lox at file
+ \ifx\lox at maybeeol\lox at eol\else\lox at typesettrue\fi
+ \else
+ \lox at typesettrue
+ \fi
+ \fi
+ \closein\lox at file
+ \iflox at typeset\@lox at prtc\@starttoc{lox}\@lox at psttc\else\@starttoc{lox}\fi}
\newcommand\lox at draft@ams{\@starttoc{lox}\@fxlistfixmename}
\newcommand*\fxsetface[2]{\@fxsetkeys{face}{#1face=#2}}
@@ -203,11 +212,14 @@
\@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[%
@@ -214,12 +226,10 @@
{\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 at 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 at note@author}%
\fi}}
\newcommand*\@fxissuecommonlayouts[2]{%
- \FXLayoutContentsLine{#1}{#2}{\cmdfx at note@author}%
\iffx at log@silent\else\@nameuse{@fxlog@#1}{#2}\fi}
\newcommand*\@@@fxnote at early@final[2]{%
@@ -428,6 +434,7 @@
\@fxissueearlydraftlayouts{#1}{#2}}
\newcommand*\@@@fxnote at late@draft[2]{%
\@fxissuelatedraftlayouts{#1}{#2}%
+ \FXLayoutContentsLine{#1}{#2}{\cmdfx at note@author}%
\@fxissuecommonlayouts{#1}{#2}}
\newcommand*\@fxpostconfigure{%
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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 at 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 at mode@multiuser%
- \@fxdosig{#3}%
- \fxaddcontentsline{\color{fx#1}#2\@fxsignature}%
+ \fxaddcontentsline{\color{fx#1}#2\@fxsignature{#3}}%
\else%
\fxaddcontentsline{\color{fx#1}#2}%
\fi}
Modified: trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty 2017-03-06 14:22:59 UTC (rev 43412)
+++ trunk/Master/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty 2017-03-06 21:58:12 UTC (rev 43413)
@@ -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 at 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 at mode@multiuser%
- \@fxdosig{#3}%
- \fxaddcontentsline{\fxnotename{#1}: #2\@fxsignature}%
+ \fxaddcontentsline{\@fxsigstd{#1}{#2}{#3}}%
\else%
\fxaddcontentsline{\fxnotename{#1}: #2}%
\fi}
More information about the tex-live-commits
mailing list