todonotes (22oct14)

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

1 files changed, 39 insertions, 12 deletions

diff --git a/Master/texmf-dist/source/latex/todonotes/todonotes.dtx b/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
index c0d3f152051..718f89bebb0 100644
--- a/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
+++ b/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
@@ -47,7 +47,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{577}
+% \CheckSum{596}
 %
 % \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
@@ -178,6 +178,10 @@
 %             Mentioned that default arguments can be set using the presetkeys command.
 %             Updated list of alternatives to the todonotes package.
 %             Draw borders around coloured boxes in the list of todos, patch by Ze Loff.}
+% \changes{1.0.3}{2014/10/21}{Added the option figcolor to missing figure, patch by Pascal Hebbeker.
+%             Added Croatian translation by Ican Kokan.
+%             Changed default with of missingfigure.
+%             Removed some underfull box warnings, solution by Ernst Blecha.} 
 % \GetFileInfo{todonotes.dtx}   
 %
 % \DoNotIndex{\newcommand,\newenvironment}
@@ -216,13 +220,13 @@
 % 
 % Some alternatives for the todonotes package are:
 % \begin{itemize}
-% \item \href{http://www.ctan.org/tex-archive/macros/latex/contrib/easy-todo}{easy-todo}\\
+% \item \href{http://mirrors.ctan.org/tex-archive/macros/latex/contrib/easy-todo}{easy-todo}\\
 % Depends on |color|, |tocloft| and |ifthen|, small feature set.
-% \item \href{http://www.ctan.org/pkg/fixmetodonotes}{fixmetodonotes}\\
+% \item \href{http://mirrors.ctan.org/tex-archive/macros/latex/contrib/fixmetodonotes}{fixmetodonotes}\\
 % Depends on |graphicx|, |color|, |transparent|, |watermark|,|fix-cm|, |ulem| and |tocloft|, small feature set.
-% \item \href{http://www.ctan.org/tex-archive/macros/latex/contrib/todo}{todo}\\
+% \item \href{http://mirrors.ctan.org/tex-archive/macros/latex/contrib/todo}{todo}\\
 % Depends on |amssymb|, medium feature set.
-% \item \href{http://www.ctan.org/tex-archive/macros/latex/contrib/fixme}{fixme}\\
+% \item \href{http://mirrors.ctan.org/tex-archive/macros/latex/contrib/fixme}{fixme}\\
 % Large package with a lot of features.
 % \end{itemize}
 % The main reason for considering other packages is that the todonotes 
@@ -300,13 +304,14 @@
 %
 % \DescribeMacro{danish, german, ngerman, french, swedish}
 % \DescribeMacro{spanish, catalan, italian}
-% \DescribeMacro{portuguese, dutch}
+% \DescribeMacro{portuguese, dutch, croatian}
 % Use translations of the text strings 
 % ''List of todos'' and ''Missing figure''.
 % The default is to use none of these options, which results in
 % english text strings.
 % Currently the following languages are supported: 
 % catalan,
+% croatian,
 % danish,
 % dutch,
 % french,
@@ -374,7 +379,7 @@
 % \DescribeMacro{figwidth}
 % The |figwidth=length| option sets the default width of the figure
 % inserted by the |\missingfigure| command. 
-% The default value is |\columnwidth|.
+% The default value is |\linewidth|.
 %
 % 
 %
@@ -547,13 +552,13 @@
 % \missingfigure{Testing a long text string}
 % \end{verbatim}
 % \missingfigure{Testing a long text string}
-% \begin{wrapfigure}{r}[2cm]{6cm}
+% \begin{wrapfigure}[1]{r}[2cm]{6cm}
 % \missingfigure[figwidth=6cm]{Add a test image \ldots}
 % \end{wrapfigure}
 % Another usage of the option is when |\missingfigure| is used in
 % the wrapfigure environment.
 % \begin{verbatim}
-% \begin{wrapfigure}{r}[2cm]{6cm}
+% \begin{wrapfigure}[1]{r}[2cm]{6cm}
 % \missingfigure[figwidth=6cm]{Add a test image \ldots}
 % \end{wrapfigure}
 % \end{verbatim}
@@ -569,6 +574,15 @@
 % \missingfigure[figheight=6cm]{Testing}
 %
 %
+% \DescribeMacro{figcolor}
+% The |figcolor=color| options sets the background color of 
+% inserted missing figures.
+% The default color is |black!40|.
+% \begin{verbatim}
+% \missingfigure[figcolor=white]{Testing figcolor}
+% \end{verbatim}
+% \missingfigure[figcolor=white]{Testing figcolor}
+%
 % \subsection{Options for the listoftodos command}
 % The |\listoftodos| command takes one optional argument, that
 % defines the name of the inserted list of todos.
@@ -1141,8 +1155,9 @@
 \newcommand{\@todonotes@bordercolor}{black}
 \newcommand{\@todonotes@textwidth}{\marginparwidth}
 \newcommand{\@todonotes@textsize}{\normalsize}
-\newcommand{\@todonotes@figwidth}{\columnwidth}
+\newcommand{\@todonotes@figwidth}{\linewidth}
 \newcommand{\@todonotes@figheight}{4cm}
+\newcommand{\@todonotes@figcolor}{black!40}
 %    \end{macrocode}
 %    \begin{macrocode}
 \AtBeginDocument{
@@ -1178,6 +1193,12 @@
     \@todonotes@SetMissingFigureUp{Figura}%
     \@todonotes@SetMissingFigureDown{pendent}%
 }
+\DeclareOptionX{croatian}{%
+   \@todonotes@SetTodoListName{Popis obveza}%
+   \@todonotes@SetMissingFigureText{Slika}%
+   \@todonotes@SetMissingFigureUp{Nedostaje}%
+   \@todonotes@SetMissingFigureDown{slika}%
+}
 \DeclareOptionX{danish}{%
     \@todonotes@SetTodoListName{G\o{}rem\aa{}lsliste}%
     \@todonotes@SetMissingFigureText{Figur}%
@@ -1339,6 +1360,8 @@
     {figwidth}{\renewcommand{\@todonotes@figwidth}{#1}}
 \define@key{todonotes.sty}%
     {figheight}{\renewcommand{\@todonotes@figheight}{#1}}
+\define@key{todonotes.sty}%
+    {figcolor}{\renewcommand{\@todonotes@figcolor}{#1}}
 %    \end{macrocode}
 % Make the text width as an option.
 %    \begin{macrocode}
@@ -1459,6 +1482,9 @@
 \newcommand{\@todonotes@currentfigheight}{\@todonotes@figheight}
 \define@key{todonotes}%
     {figheight}{\renewcommand{\@todonotes@currentfigheight}{#1}}
+\newcommand{\@todonotes@currentfigcolor}{\@todonotes@figcolor}
+\define@key{todonotes}%
+    {figcolor}{\renewcommand{\@todonotes@currentfigcolor}{#1}}
 %    \end{macrocode}
 % Preset values of the options
 %    \begin{macrocode}
@@ -1474,6 +1500,7 @@
     noauthor,%
     figwidth=\@todonotes@figwidth,%
     figheight=\@todonotes@figheight,%
+    figcolor=\@todonotes@figcolor,%
     line, list, size=\@todonotes@textsize}{}%
 %    \end{macrocode}
 % \subsection{The main code part}
@@ -1756,7 +1783,7 @@
 \par
 \noindent
 \begin{tikzpicture}
-\draw[fill=black!40, draw = white, line width=0pt] 
+\draw[fill=\@todonotes@currentfigcolor, draw = black!40, line width=2pt]
     (-2, -2.5) rectangle +(\@todonotes@currentfigwidth, \@todonotes@currentfigheight);
 \draw (2, -0.3) node[right, text
     width=\@todonotes@currentfigwidth-4.5cm] {#2};
@@ -1764,7 +1791,7 @@
     (30:2cm) -- (150:2cm) -- (270:2cm) -- cycle;
 \draw (0, 0.3) node {\@todonotes@MissingFigureUp};
 \draw (0, -0.3) node {\@todonotes@MissingFigureDown};
-\end{tikzpicture}
+\end{tikzpicture}\hfill
 }% Ending \missingfigure command
 \fi % Ending \@todonotes@ifdisabled
 %    \end{macrocode}