todonotes (2nov16)

git-svn-id: svn://tug.org/texlive/trunk@42423 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 30 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/latex/todonotes/todonotes.dtx b/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
index 7c4866551ad..9cdb9290998 100644
--- a/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
+++ b/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
@@ -184,6 +184,7 @@
 %             Removed some underfull box warnings, solution by Ernst Blecha.} 
 % \changes{1.0.4}{2015/07/09}{Restructured documentation and placed some examples in the 
 %             doc/examples subdirectory.}
+% \changes{1.0.5}{2016/11/02}{Example of how to change the space eating behaviour added by Anselm Wagner. Reduced the width of missingfigure to avoid bad box warnings.}
 % \GetFileInfo{todonotes.dtx}   
 %
 % \DoNotIndex{\newcommand,\newenvironment}
@@ -304,7 +305,7 @@
 % The option |obeyFinal| does something similar, except that the 
 % todonotes package is only disabled if the |final| option given.
 %
-% \DescribeMacro{danish, german, ngerman, french, swedish}
+% \DescribeMacro{danish, german, ngerman, english, french, swedish}
 % \DescribeMacro{spanish, catalan, italian}
 % \DescribeMacro{portuguese, dutch, croatian}
 % Use translations of the text strings 
@@ -316,6 +317,7 @@
 % croatian,
 % danish,
 % dutch,
+% english, 
 % french,
 % german,
 % ngerman,
@@ -627,10 +629,16 @@
 % \subsubsection{Spacing around inserted notes}
 % Inserted todo commands will eat the white space after the command.
 % \begin{verbatim}
-%Testing\todo{Does this eat the space?} testing
-% \end{verbatim}
-% 
-% Testing\todo{Does this eat the space?}testing
+%Testing\todo{Does this eat the space?} testing.\end{verbatim}
+% \noindent
+% Testing\todo{Does this eat the space?} testing.
+%
+% This can be prevented by adding curly parenthesis after the 
+% todo command, like shown below.
+% \begin{verbatim}
+%Testing\todo{Does this eat the space?}{} testing.\end{verbatim}
+% \noindent
+% Testing\todo{Does this eat the space?}{} testing.
 %
 % \subsubsection{Wrapping of long lines in list of todos}
 % When a document is compiled with latex (and not pdflatex) long
@@ -1119,11 +1127,23 @@
 % \subsubsection{Highligt text to fix}
 % Tobias Winchen provides the following example on how to highlight
 % text related to the inserted todonote.
-% \newcommand{\hlfix}[2]{\texthl{#1}\todo{#2}} 
+% \makeatletter
+% \if@todonotes@disabled
+% \newcommand{\hlfix}[2]{#1}
+% \else
+% \newcommand{\hlfix}[2]{\texthl{#1}\todo{#2}}
+% \fi
+% \makeatother
 % Example \hlfix{wrong text}{fix text}~continues here. 
 % Notice that the code relies on the \verb!soul! package.
 % \begin{verbatim}
-% \newcommand{\hlfix}[2]{\texthl{#1}\todo{#2}} 
+% \makeatletter
+% \if@todonotes@disabled
+% \newcommand{\hlfix}[2]{#1}
+% \else
+% \newcommand{\hlfix}[2]{\texthl{#1}\todo{#2}}
+% \fi
+% \makeatother
 % Example \hlfix{wrong text}{fix text}~continues here. 
 % \end{verbatim}
 % 
@@ -1480,10 +1500,10 @@
 %    \begin{macrocode}
 \newcommand{\@todonotes@currentfigwidth}{\@todonotes@figwidth}
 \define@key{todonotes}%
-    {figwidth}{\renewcommand{\@todonotes@currentfigwidth}{#1}}
+    {figwidth}{\renewcommand{\@todonotes@currentfigwidth}{#1-2pt}}
 \newcommand{\@todonotes@currentfigheight}{\@todonotes@figheight}
 \define@key{todonotes}%
-    {figheight}{\renewcommand{\@todonotes@currentfigheight}{#1}}
+    {figheight}{\renewcommand{\@todonotes@currentfigheight}{#1-2pt}}
 \newcommand{\@todonotes@currentfigcolor}{\@todonotes@figcolor}
 \define@key{todonotes}%
     {figcolor}{\renewcommand{\@todonotes@currentfigcolor}{#1}}
@@ -1795,7 +1815,7 @@
 \draw (0, -0.3) node {\@todonotes@MissingFigureDown};
 \end{tikzpicture}\hfill
 }% Ending \missingfigure command
-\fi % Ending \@todonotes@ifdisabled
+\fi% Ending \@todonotes@ifdisabled
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\todototoc}