4 files changed, 15 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf b/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf
index ec036618549..72663179748 100644
--- a/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf
+++ b/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf
diff --git a/Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf b/Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf
index 01ec998fb9f..b5bd8eff4ac 100644
--- a/Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf
+++ b/Master/texmf-dist/doc/latex/todonotes/todonotesexample.pdf
diff --git a/Master/texmf-dist/source/latex/todonotes/todonotes.dtx b/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
index 7725a6e419e..40cd0464682 100644
--- a/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
+++ b/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
@@ -22,14 +22,14 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{todonotes}
 %<*package>
-    [2011/03/07 .dtx Todonotes source and documentation.]
+    [2011/04/21 .dtx Todonotes source and documentation.]
 %</package>
 %
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{wrapfig}
 \usepackage[colorlinks, linkcolor=black]{hyperref}
-\usepackage[colorinlistoftodos, shadow]{todonotes}[2011/03/07]
+\usepackage[colorinlistoftodos, shadow]{todonotes}[2011/04/21]
 \usepackage{amsmath}
 \usepackage{setspace}
 \setcounter{tocdepth}{2}
@@ -46,7 +46,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{0}
+% \CheckSum{495}
 %
 % \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
@@ -159,6 +159,8 @@
 % \changes{0.9.6}{2010/11/04}{Give fontsize to TikZ. Align notes with line where note 
 %             is set. Added new option fancyline. Patches by Benjamin Kellermann.}
 % \changes{0.9.7}{2011/03/07}{Updated documentation.}
+% \changes{0.9.8}{2011/04/21}{Suppress warnings about underfull / overful boxes 
+%             generated by the inserted todonotes. Patch by Peter M Schuler.}
 % \GetFileInfo{todonotes.dtx}   
 %
 % \DoNotIndex{\newcommand,\newenvironment}
@@ -359,7 +361,7 @@
 % options, see section \ref{subsecPackageOptions}.
 % Default values can be set by the color
 % options when the todonotes package is loaded.
-% \todo[color=green!40]{And a green note}
+% \todo[color=green!40]{And a green note withaverylongwordthathastocausesometrouble}
 % The todo notes inserted in this paragraph is created with the
 % command
 % |\todo[color=green!40]{And a green note}|.
@@ -947,7 +949,7 @@
 %
 % Identifies the package and loads the packages dependences.
 %    \begin{macrocode}
-\ProvidesPackage{todonotes}[2011/03/07]
+\ProvidesPackage{todonotes}[2011/04/21]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}
 \RequirePackage{xcolor}
@@ -1444,11 +1446,14 @@
         \draw node[notestyle] (inNote) {};%
     \end{tikzpicture}%
 \else%
+	\let\originalHbadness\hbadness
+	\hbadness 100000
     \begin{tikzpicture}[remember picture,baseline=(X.base)]%
     		\node(X){\vphantom{X}};%
         \draw node[notestyle,font=\@todonotes@sizecommand,anchor=north] (inNote) at (X.north)%
             {\@todonotes@text};%
     \end{tikzpicture}%
+	\hbadness \originalHbadness
 \fi}%
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/todonotes/todonotes.sty b/Master/texmf-dist/tex/latex/todonotes/todonotes.sty
index 2144bbf207e..6e6e391ec02 100644
--- a/Master/texmf-dist/tex/latex/todonotes/todonotes.sty
+++ b/Master/texmf-dist/tex/latex/todonotes/todonotes.sty
@@ -22,9 +22,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{todonotes}
-    [2011/03/07 .dtx Todonotes source and documentation.]
+    [2011/04/21 .dtx Todonotes source and documentation.]
 
-\ProvidesPackage{todonotes}[2011/03/07]
+\ProvidesPackage{todonotes}[2011/04/21]
 \RequirePackage{ifthen}
 \RequirePackage{xkeyval}
 \RequirePackage{xcolor}
@@ -324,11 +324,14 @@
         \draw node[notestyle] (inNote) {};%
     \end{tikzpicture}%
 \else%
+\let\originalHbadness\hbadness
+\hbadness 100000
     \begin{tikzpicture}[remember picture,baseline=(X.base)]%
      \node(X){\vphantom{X}};%
         \draw node[notestyle,font=\@todonotes@sizecommand,anchor=north] (inNote) at (X.north)%
             {\@todonotes@text};%
     \end{tikzpicture}%
+\hbadness \originalHbadness
 \fi}%
 \newcommand{\@todonotes@drawLineToRightMargin}{%
 \if@todonotes@line%