From 0d2b2b5074b0c056669ded2d8830ff892289d4a7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 24 Oct 2014 00:39:28 +0000 Subject: todonotes (22oct14) git-svn-id: svn://tug.org/texlive/trunk@35429 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/todonotes/todonotes.pdf | Bin 313846 -> 315211 bytes .../doc/latex/todonotes/todonotesexample.pdf | Bin 49077 -> 0 bytes .../doc/latex/todonotes/todonotesexample.tex | 53 --------------------- .../source/latex/todonotes/todonotes.dtx | 51 +++++++++++++++----- .../texmf-dist/tex/latex/todonotes/todonotes.sty | 19 ++++++-- 5 files changed, 55 insertions(+), 68 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf delete mode 100644 Master/texmf-dist/doc/latex/todonotes/todonotesexample.tex (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf b/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf index bf56349cacb..519df61f4d9 100644 Binary files a/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf and b/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf b/Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf deleted file mode 100644 index ae607662033..00000000000 Binary files a/Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/todonotes/todonotesexample.tex b/Master/texmf-dist/doc/latex/todonotes/todonotesexample.tex deleted file mode 100644 index 01bfe35e64d..00000000000 --- a/Master/texmf-dist/doc/latex/todonotes/todonotesexample.tex +++ /dev/null @@ -1,53 +0,0 @@ -\documentclass{article} -\usepackage[colorlinks]{hyperref} -\usepackage[colorinlistoftodos, textwidth=4cm, shadow]{todonotes} -\usepackage{amsmath} -\usepackage[displaymath, tightpage]{preview} - - -\begin{document} -\listoftodos - -Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla -\todo[disable]{Plain todonotes.}% -urna. Maecenas interdum nunc in augue. Mauris quis massa in ante -tincidunt mollis. Proin imperdiet. Donec porttitor pede id est. Sed -in ante. Integer id arcu. Nam lectus nisl, posuere sit amet, -imperdiet ut, tristique ac, lorem. In erat. In commodo enim. -\todo[color=blue!40]{Todonote with a different color.}% -Phasellus libero ipsum, tempor a, pharetra consequat, pellentesque -sit amet, sem. Praesent ut augue luctus elit adipiscing ultricies. -Vestibulum suscipit cursus leo. Nullam molestie justo. - - -Morbi dui. Morbi convallis mi sed sem. Nulla convallis lacus vitae -risus. Phasellus adipiscing. Nullam tortor. Sed laoreet aliquam -ante. Vestibulum diam. Pellentesque nec leo. Pellentesque velit. -\todo[nolist]{Todonote that is only shown in the margin and not in -the list of todos.}% -Praesent congue mi eu ipsum cursus fringilla. Etiam leo erat, -tristique et, pharetra eget, mollis vitae, velit. In hac habitasse -\todo[size=\small, color=green!40]{A note with a small fontsize.}% -platea dictumst. In quam nibh, facilisis et, laoreet non, facilisis -tempus, justo. - -\todo[inline]{A very long todonote that certainly will fill more -than a single line in the list of todos. Just to make sure let's add -some more text \ldots} - -Donec nulla lectus, faucibus sit amet, auctor non, consectetuer -quis, pede. Nullam dictum. Nullam suscipit, ligula in scelerisque -\todo[noline]{A note with no line back to the text.}% -posuere, sapien purus rutrum magna, vitae pharetra leo quam vel -tortor. Donec eleifend condimentum sapien. Etiam sed orci. Aliquam -\todo[inline, color=red!50]{Inline todonotes.}% -tempor. Pellentesque egestas tortor id eros. Donec mauris justo, -commodo id, pellentesque id, eleifend non, mi. Duis venenatis -\todo[caption={A short entry in the list of todos}]{A very long -todonote that certainly will fill more than a single line in the -list of todos \ldots} -sagittis metus. -\missingfigure{A figure I have to make \ldots} -\missingfigure[figwidth=\textwidth]{A figure I have to make \ldots} - -\end{document} 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 @@ % % \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} diff --git a/Master/texmf-dist/tex/latex/todonotes/todonotes.sty b/Master/texmf-dist/tex/latex/todonotes/todonotes.sty index 0500be6f5eb..6f8258a8a81 100644 --- a/Master/texmf-dist/tex/latex/todonotes/todonotes.sty +++ b/Master/texmf-dist/tex/latex/todonotes/todonotes.sty @@ -37,8 +37,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} \AtBeginDocument{ \ifx\undefined\phantomsection \newcommand{\phantomsection}{} @@ -64,6 +65,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}% @@ -167,6 +174,8 @@ {figwidth}{\renewcommand{\@todonotes@figwidth}{#1}} \define@key{todonotes.sty}% {figheight}{\renewcommand{\@todonotes@figheight}{#1}} +\define@key{todonotes.sty}% + {figcolor}{\renewcommand{\@todonotes@figcolor}{#1}} \ProcessOptionsX* \if@todonotes@disabled \else @@ -234,6 +243,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}} \presetkeys% {todonotes}% {linecolor=\@todonotes@linecolor,% @@ -246,6 +258,7 @@ noauthor,% figwidth=\@todonotes@figwidth,% figheight=\@todonotes@figheight,% + figcolor=\@todonotes@figcolor,% line, list, size=\@todonotes@textsize}{}% \if@todonotes@disabled% \newcommand{\listoftodos}[1][]{} @@ -437,7 +450,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}; @@ -445,7 +458,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 \newcommand{\todototoc} -- cgit v1.2.3