From a0a6c9380d72654c67032aeaa639e1d4c54bbfad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 31 Dec 2009 01:35:29 +0000 Subject: todonotes update (26dec09) git-svn-id: svn://tug.org/texlive/trunk@16544 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/todonotes/todonotes.pdf | Bin 203519 -> 207287 bytes .../doc/latex/todonotes/todonotesexample.pdf | Bin 28184 -> 12196 bytes .../doc/latex/todonotes/todonotesexample.tex | 3 +- .../source/latex/todonotes/todonotes.dtx | 97 +++++++++++++++------ .../texmf-dist/tex/latex/todonotes/todonotes.sty | 56 ++++++------ 5 files changed, 101 insertions(+), 55 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf b/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf index eee0a212e47..482bd1ceae2 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 index 6772a5926c5..2a873ddbd62 100644 Binary files a/Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf and b/Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf differ diff --git a/Master/texmf-dist/doc/latex/todonotes/todonotesexample.tex b/Master/texmf-dist/doc/latex/todonotes/todonotesexample.tex index 1409fe837fb..740e9d2517f 100644 --- a/Master/texmf-dist/doc/latex/todonotes/todonotesexample.tex +++ b/Master/texmf-dist/doc/latex/todonotes/todonotesexample.tex @@ -1,6 +1,6 @@ \documentclass{article} \usepackage[colorlinks]{hyperref} -\usepackage[colorinlistoftodos, textwidth=4cm, shadow]{todonotes} +\usepackage[colorinlistoftodos, textwidth=4cm, shadow, disable]{todonotes} \usepackage{amsmath} \usepackage[displaymath, tightpage]{preview} @@ -48,5 +48,6 @@ 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 5e6063bcc28..12a3f268e8e 100644 --- a/Master/texmf-dist/source/latex/todonotes/todonotes.dtx +++ b/Master/texmf-dist/source/latex/todonotes/todonotes.dtx @@ -22,14 +22,14 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{todonotes} %<*package> - [2009/10/24 .dtx Todonotes source and documentation.] + [2009/12/25 .dtx Todonotes source and documentation.] % % %<*driver> \documentclass{ltxdoc} \usepackage{wrapfig} \usepackage[colorlinks, linkcolor=black]{hyperref} -\usepackage[colorinlistoftodos, shadow]{todonotes}[2009/10/24] +\usepackage[colorinlistoftodos, shadow]{todonotes}[2009/12/25] \usepackage{amsmath} \usepackage{setspace} \setcounter{tocdepth}{2} @@ -46,7 +46,7 @@ % % \fi % -% \CheckSum{425} +% \CheckSum{430} % % \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 @@ -144,6 +144,10 @@ % \changes{0.8.6}{2009/08/05}{Added a portuguese translation by Og DeSouza.} % \changes{0.8.7}{2009/10/24}{Updated portuguese translation. Added a ngerman % alias for the german translation suggested by Michael Niedermair.} +% \changes{0.8.8}{2009/12/07}{Added a new usecase from Vitaly. Fixed a +% bug reported by Oscar Gustafsson. Explained why the placement +% of todonotes in the margin fails in certain custom document classes.} +% \changes{0.8.9}{2009/12/25}{Added a dutch translation by Ruben Ruben Vermeersch.} % % \GetFileInfo{todonotes.dtx} % @@ -243,7 +247,7 @@ % % \DescribeMacro{danish, german, ngerman, french} % \DescribeMacro{spanish, catalan, italian} -% \DescribeMacro{portuguese} +% \DescribeMacro{portuguese, dutch} % Use translations of the text strings % ''List of todos'' and ''Missing figure''. % The default is to use none of these options, which results in @@ -251,6 +255,7 @@ % Currently the following languages are supported: % catalan, % danish, +% dutch, % french, % german, % ngerman, @@ -439,7 +444,7 @@ % \DescribeMacro{figwidth} % The |figwidth=length| option sets the default width of the figure % inserted by the |\missingfigure| command. -% The default value is |\textwidth|. +% The default value is |\columnwidth|. % % % @@ -538,6 +543,16 @@ % \url{http://www.ctan.org/tex-archive/graphics/pgf/base/doc/generic/pgf/pgfmanual.pdf} % % +% \subsubsection{Todonotes wrongly placed in the margin} +% When using some document classes or packages, the todonotes inserted in the +% page margin can be placed quite oddly. +% This is often caused by a wrong value of the |\marginparwidth| lenght. +% Try using the code below in your preamble to see if this cures the problem. +% \begin{verbatim} +% \setlength{\marginparwidth}{2cm} +% \end{verbatim} +% +% % \subsection{Things to improve} % This is a list of things I consider to improve sometime in the % future. It have not been done yet as I lack the time or skills to @@ -735,6 +750,24 @@ % distributions.} % \end{verbatim} % +% \noindent +% A different approach is given by Vitaly. +% \newcommand{\tinytodo}[2][] +% {\todo[caption={#2}, size=\small, #1]{\renewcommand{\baselinestretch}{0.5}\selectfont#2\par}} +% \begin{verbatim} +% \newcommand{\tinytodo}[2][] +% {\todo[caption={#2}, size=\small, #1]{\renewcommand{\baselinestretch}{0.5}\selectfont#2\par}} +% \end{verbatim} +% It looks like seen here. +% \tinytodo{ +% Some lines with a decreased line spacing. This is accomplished +% without using any special packages.} +% \begin{verbatim} +% \tinytodo{ +% Some lines with a decreased line spacing. This is accomplished +% without using any special packages.} +% \end{verbatim} +% % % % @@ -857,7 +890,7 @@ \newcommand{\@todonotes@bordercolor}{black} \newcommand{\@todonotes@textwidth}{\marginparwidth} \newcommand{\@todonotes@textsize}{\normalsize} -\newcommand{\@todonotes@figwidth}{\textwidth} +\newcommand{\@todonotes@figwidth}{\columnwidth} % \end{macrocode} % \begin{macrocode} \AtBeginDocument{ @@ -887,23 +920,23 @@ \newcommand{\@todonotes@SetMissingFigureDown}[1] {\renewcommand{\@todonotes@MissingFigureDown}{#1}} \newif{\if@todonotes@reverseMissingFigureTriangle} +\DeclareOptionX{catalan}{ + \@todonotes@SetTodoListName{Llista de feines pendents}% + \@todonotes@SetMissingFigureText{Figura}% + \@todonotes@SetMissingFigureUp{Figura}% + \@todonotes@SetMissingFigureDown{pendent}% +} \DeclareOptionX{danish}{% \@todonotes@SetTodoListName{G\o{}rem\aa{}lsliste}% \@todonotes@SetMissingFigureText{Figur}% \@todonotes@SetMissingFigureUp{Manglende}% \@todonotes@SetMissingFigureDown{figur}% } -\DeclareOptionX{german}{% - \@todonotes@SetTodoListName{Liste der noch zu erledigenden Punkte}% - \@todonotes@SetMissingFigureText{Abbildung}% - \@todonotes@SetMissingFigureUp{Fehlende}% - \@todonotes@SetMissingFigureDown{Abbildung}% -} -\DeclareOptionX{ngerman}{% - \@todonotes@SetTodoListName{Liste der noch zu erledigenden Punkte}% - \@todonotes@SetMissingFigureText{Abbildung}% - \@todonotes@SetMissingFigureUp{Fehlende}% - \@todonotes@SetMissingFigureDown{Abbildung}% +\DeclareOptionX{dutch}{% + \@todonotes@SetTodoListName{Lijst van onafgewerkte taken}% + \@todonotes@SetMissingFigureText{Figuur}% + \@todonotes@SetMissingFigureUp{Ontbrekende}% + \@todonotes@SetMissingFigureDown{figuur}% } \DeclareOptionX{french}{% \@todonotes@SetTodoListName{Liste des points \`a traiter}% @@ -912,17 +945,11 @@ \@todonotes@SetMissingFigureDown{manquante}% \@todonotes@reverseMissingFigureTrianglefalse } -\DeclareOptionX{catalan}{ - \@todonotes@SetTodoListName{Llista de feines pendents}% - \@todonotes@SetMissingFigureText{Figura}% - \@todonotes@SetMissingFigureUp{Figura}% - \@todonotes@SetMissingFigureDown{pendent}% -} -\DeclareOptionX{spanish}{ - \@todonotes@SetTodoListName{Lista de tareas pendientes}% - \@todonotes@SetMissingFigureText{Figura}% - \@todonotes@SetMissingFigureUp{Figura}% - \@todonotes@SetMissingFigureDown{pendient}% +\DeclareOptionX{german}{% + \@todonotes@SetTodoListName{Liste der noch zu erledigenden Punkte}% + \@todonotes@SetMissingFigureText{Abbildung}% + \@todonotes@SetMissingFigureUp{Fehlende}% + \@todonotes@SetMissingFigureDown{Abbildung}% } \DeclareOptionX{italian}{ \@todonotes@SetTodoListName{Elenco delle cose da fare}% @@ -930,12 +957,24 @@ \@todonotes@SetMissingFigureUp{Figura}% \@todonotes@SetMissingFigureDown{mancante}% } +\DeclareOptionX{ngerman}{% + \@todonotes@SetTodoListName{Liste der noch zu erledigenden Punkte}% + \@todonotes@SetMissingFigureText{Abbildung}% + \@todonotes@SetMissingFigureUp{Fehlende}% + \@todonotes@SetMissingFigureDown{Abbildung}% +} \DeclareOptionX{portuguese}{ \@todonotes@SetTodoListName{Lista de tarefas pendentes}% \@todonotes@SetMissingFigureText{Figura}% \@todonotes@SetMissingFigureUp{Figura}% \@todonotes@SetMissingFigureDown{pendente}% } +\DeclareOptionX{spanish}{ + \@todonotes@SetTodoListName{Lista de tareas pendientes}% + \@todonotes@SetMissingFigureText{Figura}% + \@todonotes@SetMissingFigureUp{Figura}% + \@todonotes@SetMissingFigureDown{pendient}% +} % \end{macrocode} % Create a counter, for storing the number of inserted todos. % \begin{macrocode} @@ -1135,7 +1174,7 @@ \if@todonotes@disabled% \newcommand{\listoftodos}[1][]{} \newcommand{\todo}[2][]{\ignorespaces} - \newcommand{\missingfigure}[2]{} + \newcommand{\missingfigure}[2][]{} \else % \if@todonotes@disabled % \end{macrocode} % Define the |\listoftodos| command and define the diff --git a/Master/texmf-dist/tex/latex/todonotes/todonotes.sty b/Master/texmf-dist/tex/latex/todonotes/todonotes.sty index 6e169bce4a4..27d23195bdd 100644 --- a/Master/texmf-dist/tex/latex/todonotes/todonotes.sty +++ b/Master/texmf-dist/tex/latex/todonotes/todonotes.sty @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{todonotes} - [2009/10/24 .dtx Todonotes source and documentation.] + [2009/12/25 .dtx Todonotes source and documentation.] \ProvidesPackage{todonotes}[2009/04/02] \RequirePackage{ifthen} @@ -36,7 +36,7 @@ \newcommand{\@todonotes@bordercolor}{black} \newcommand{\@todonotes@textwidth}{\marginparwidth} \newcommand{\@todonotes@textsize}{\normalsize} -\newcommand{\@todonotes@figwidth}{\textwidth} +\newcommand{\@todonotes@figwidth}{\columnwidth} \AtBeginDocument{ \ifx\undefined\phantomsection \newcommand{\phantomsection}{} @@ -56,23 +56,23 @@ \newcommand{\@todonotes@SetMissingFigureDown}[1] {\renewcommand{\@todonotes@MissingFigureDown}{#1}} \newif{\if@todonotes@reverseMissingFigureTriangle} +\DeclareOptionX{catalan}{ + \@todonotes@SetTodoListName{Llista de feines pendents}% + \@todonotes@SetMissingFigureText{Figura}% + \@todonotes@SetMissingFigureUp{Figura}% + \@todonotes@SetMissingFigureDown{pendent}% +} \DeclareOptionX{danish}{% \@todonotes@SetTodoListName{G\o{}rem\aa{}lsliste}% \@todonotes@SetMissingFigureText{Figur}% \@todonotes@SetMissingFigureUp{Manglende}% \@todonotes@SetMissingFigureDown{figur}% } -\DeclareOptionX{german}{% - \@todonotes@SetTodoListName{Liste der noch zu erledigenden Punkte}% - \@todonotes@SetMissingFigureText{Abbildung}% - \@todonotes@SetMissingFigureUp{Fehlende}% - \@todonotes@SetMissingFigureDown{Abbildung}% -} -\DeclareOptionX{ngerman}{% - \@todonotes@SetTodoListName{Liste der noch zu erledigenden Punkte}% - \@todonotes@SetMissingFigureText{Abbildung}% - \@todonotes@SetMissingFigureUp{Fehlende}% - \@todonotes@SetMissingFigureDown{Abbildung}% +\DeclareOptionX{dutch}{% + \@todonotes@SetTodoListName{Lijst van onafgewerkte taken}% + \@todonotes@SetMissingFigureText{Figuur}% + \@todonotes@SetMissingFigureUp{Ontbrekende}% + \@todonotes@SetMissingFigureDown{figuur}% } \DeclareOptionX{french}{% \@todonotes@SetTodoListName{Liste des points \`a traiter}% @@ -81,17 +81,11 @@ \@todonotes@SetMissingFigureDown{manquante}% \@todonotes@reverseMissingFigureTrianglefalse } -\DeclareOptionX{catalan}{ - \@todonotes@SetTodoListName{Llista de feines pendents}% - \@todonotes@SetMissingFigureText{Figura}% - \@todonotes@SetMissingFigureUp{Figura}% - \@todonotes@SetMissingFigureDown{pendent}% -} -\DeclareOptionX{spanish}{ - \@todonotes@SetTodoListName{Lista de tareas pendientes}% - \@todonotes@SetMissingFigureText{Figura}% - \@todonotes@SetMissingFigureUp{Figura}% - \@todonotes@SetMissingFigureDown{pendient}% +\DeclareOptionX{german}{% + \@todonotes@SetTodoListName{Liste der noch zu erledigenden Punkte}% + \@todonotes@SetMissingFigureText{Abbildung}% + \@todonotes@SetMissingFigureUp{Fehlende}% + \@todonotes@SetMissingFigureDown{Abbildung}% } \DeclareOptionX{italian}{ \@todonotes@SetTodoListName{Elenco delle cose da fare}% @@ -99,12 +93,24 @@ \@todonotes@SetMissingFigureUp{Figura}% \@todonotes@SetMissingFigureDown{mancante}% } +\DeclareOptionX{ngerman}{% + \@todonotes@SetTodoListName{Liste der noch zu erledigenden Punkte}% + \@todonotes@SetMissingFigureText{Abbildung}% + \@todonotes@SetMissingFigureUp{Fehlende}% + \@todonotes@SetMissingFigureDown{Abbildung}% +} \DeclareOptionX{portuguese}{ \@todonotes@SetTodoListName{Lista de tarefas pendentes}% \@todonotes@SetMissingFigureText{Figura}% \@todonotes@SetMissingFigureUp{Figura}% \@todonotes@SetMissingFigureDown{pendente}% } +\DeclareOptionX{spanish}{ + \@todonotes@SetTodoListName{Lista de tareas pendientes}% + \@todonotes@SetMissingFigureText{Figura}% + \@todonotes@SetMissingFigureUp{Figura}% + \@todonotes@SetMissingFigureDown{pendient}% +} \newcounter{@todonotes@numberoftodonotes} \newif{\if@todonotes@obeyDraft} \DeclareOptionX{obeyDraft}{\@todonotes@obeyDrafttrue} @@ -197,7 +203,7 @@ \if@todonotes@disabled% \newcommand{\listoftodos}[1][]{} \newcommand{\todo}[2][]{\ignorespaces} - \newcommand{\missingfigure}[2]{} + \newcommand{\missingfigure}[2][]{} \else % \if@todonotes@disabled \newcommand{\listoftodos}[1][\@todonotes@todolistname] {\section*{#1} \@starttoc{tdo}} -- cgit v1.2.3