6 files changed, 67 insertions, 34 deletions
diff --git a/Master/texmf-dist/doc/latex/todonotes/examples/alterAppearenceOfListOfTodos.pdf b/Master/texmf-dist/doc/latex/todonotes/examples/alterAppearenceOfListOfTodos.pdf
index 4aa4f385ebe..9c5ad84d163 100644
--- a/Master/texmf-dist/doc/latex/todonotes/examples/alterAppearenceOfListOfTodos.pdf
+++ b/Master/texmf-dist/doc/latex/todonotes/examples/alterAppearenceOfListOfTodos.pdf
diff --git a/Master/texmf-dist/doc/latex/todonotes/examples/externalize.pdf b/Master/texmf-dist/doc/latex/todonotes/examples/externalize.pdf
index 892d8cf37cf..13fc64975f1 100644
--- a/Master/texmf-dist/doc/latex/todonotes/examples/externalize.pdf
+++ b/Master/texmf-dist/doc/latex/todonotes/examples/externalize.pdf
diff --git a/Master/texmf-dist/doc/latex/todonotes/examples/saveColorByUsingLayers.pdf b/Master/texmf-dist/doc/latex/todonotes/examples/saveColorByUsingLayers.pdf
index be2f44a1d2c..d0544a53ec9 100644
--- a/Master/texmf-dist/doc/latex/todonotes/examples/saveColorByUsingLayers.pdf
+++ b/Master/texmf-dist/doc/latex/todonotes/examples/saveColorByUsingLayers.pdf
diff --git a/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf b/Master/texmf-dist/doc/latex/todonotes/todonotes.pdf
index 4a3f5763696..a3f20cdf2b9 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/source/latex/todonotes/todonotes.dtx b/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
index b4180a797f6..484d825eb3e 100644
--- a/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
+++ b/Master/texmf-dist/source/latex/todonotes/todonotes.dtx
@@ -20,14 +20,14 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{todonotes}
 %<*package>
-    [2019/01/24 v1.1.2 Todonotes source and documentation.]
+    [2020/08/18 v1.1.3 Todonotes source and documentation.]
 %</package>
 %
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{wrapfig}
 \usepackage[colorlinks, linkcolor=black, urlcolor=blue]{hyperref}
-\usepackage[colorinlistoftodos]{todonotes}[2018/11/22]
+\usepackage[colorinlistoftodos]{todonotes}[2020/08/18]
 \usepackage{amsmath}
 \usepackage{setspace}
 \usepackage{soul}
@@ -45,7 +45,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{717}
+% \CheckSum{721}
 %
 % \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
@@ -205,6 +205,8 @@
 %             (both commands (backslash tiny) and text (tiny) are now supported).} 
 % \changes{1.1.1}{2018/11/22}{Implemented shadow and noshadow options for the todo command.}
 % \changes{1.1.2}{2019/01/24}{Fix issue 36 and 37.}
+% \changes{1.1.3}{2020/08/18}{Fix issue 48 and make colors used in the last todo 
+%             globally available.}
 % \GetFileInfo{todonotes.dtx}   
 %
 % \DoNotIndex{\newcommand,\newenvironment}
@@ -253,10 +255,10 @@
 % Large package with a lot of features.
 % \end{itemize}
 % The main reason for considering other packages is that the todonotes 
-% package is quire large and relies heavily on tikz.
+% package is quite large and relies heavily on tikz.
 % This can slow down compilation of large documents significantly.
 % The mentioned alternatives have a different feature set and does not 
-% rely on tikz, which makes them require less ressoureces.
+% rely on tikz, which makes them require fewer resources.
 %
 %
 % \subsection{Usage}
@@ -700,6 +702,12 @@
 %\usepackage{menukeys}
 % \end{verbatim}
 %
+% The following packages must be loaded before the todonotes
+% package:
+% \begin{itemize}
+% \item polyglossia
+% \end{itemize}
+%
 %
 % \subsubsection{Wrapping of long lines in list of todos}
 % When a document is compiled with latex (and not pdflatex) long
@@ -792,6 +800,33 @@
 % |\let\marginpar\oldmarginpar|
 %
 %
+% \subsubsection{todos in math and floating environments}
+% It is not possible to insert todonotes into math environments or 
+% floating environments like \verb!figure! or \verb!table!.
+% By replacing the marginpar command with a marginnote this
+% can be enabled. 
+% For todos inside math environments the todo must be placed in an 
+% \verb!mbox! or \verb!\textrm! command.
+%
+% \begin{verbatim}
+% \documentclass{article}
+% \usepackage{todonotes}
+% \usepackage{marginnote}
+% \let\marginpar\marginnote
+%
+% \begin{document}
+% \begin{equation}
+% a^2=b^2+c^2  \textrm{\todo{Test}}
+% \end{equation}
+% \begin{figure}
+% \centering
+% \caption{Caption\todo{tests}.}
+% \label{fig}
+% \end{figure}
+% 
+% \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
@@ -859,18 +894,16 @@
 % functionality of |\todo| with custom default values.
 % \begin{verbatim}
 % \newcommand{\todoredefined}[2][]
-% {\todo[color=red, #1]{#2}}
-% \end{verbatim}
+% {\todo[color=red, #1]{#2}}\end{verbatim}
 % \newcommand{\todoredefined}[2][]
 % {\todo[color=red, #1]{#2}}
-% \todoredefined{Test of newly defined command.}
-% The new command can now be used like shown below
+% The \todoredefined{Test of newly defined command.}
+% new command can now be used like shown below
 % \begin{verbatim}
 % \todoredefined{Test of newly defined command.}
-% \todoredefined[color=green]{Test of newly defined command, requesting a green color.}
-% \end{verbatim}
-% \todoredefined[color=green]{Test of newly defined command, requesting a green color.}
-% This can be done with all the accepted options for the |\todo| command.
+% \todoredefined[color=green]{Test of newly defined command, requesting a green color.} \end{verbatim}
+% This \todoredefined[color=green]{Test of newly defined command, requesting a green color.}
+% can be done with all the accepted options for the |\todo| command.
 % 
 %
 %
@@ -1497,21 +1530,21 @@ prior to loading the todonotes package.} \else\fi%
 % commands in the package are defined.
 % Set an arbitrarily fill color
 %    \begin{macrocode}
-\newcommand{\@todonotes@currentlinecolor}{}%
-\newcommand{\@todonotes@currentbackgroundcolor}{}%
-\newcommand{\@todonotes@currenttextcolor}{}%
-\newcommand{\@todonotes@currentbordercolor}{}%
+\gdef\@todonotes@currentlinecolor{\@todonotes@linecolor}%
+\gdef\@todonotes@currentbackgroundcolor{\@todonotes@backgroundcolor}%
+\gdef\@todonotes@currenttextcolor{\@todonotes@textcolor}%
+\gdef\@todonotes@currentbordercolor{\@todonotes@bordercolor}%
 \define@key{todonotes}{color}{%
-    \renewcommand{\@todonotes@currentlinecolor}{#1}%
-    \renewcommand{\@todonotes@currentbackgroundcolor}{#1}}%
+    \gdef\@todonotes@currentlinecolor{#1}%
+    \gdef\@todonotes@currentbackgroundcolor{#1}}%
 \define@key{todonotes}{linecolor}{%
-    \renewcommand{\@todonotes@currentlinecolor}{#1}}%
+    \gdef\@todonotes@currentlinecolor{#1}}%
 \define@key{todonotes}{backgroundcolor}{%
-    \renewcommand{\@todonotes@currentbackgroundcolor}{#1}}%
+    \gdef\@todonotes@currentbackgroundcolor{#1}}%
 \define@key{todonotes}{textcolor}{%
-    \renewcommand{\@todonotes@currenttextcolor}{#1}}%
+    \gdef\@todonotes@currenttextcolor{#1}}%
 \define@key{todonotes}{bordercolor}{%
-    \renewcommand{\@todonotes@currentbordercolor}{#1}}%
+    \gdef\@todonotes@currentbordercolor{#1}}%
 %    \end{macrocode}
 % Toggle whether there is a shadow behind the inserted notes.
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/todonotes/todonotes.sty b/Master/texmf-dist/tex/latex/todonotes/todonotes.sty
index 9bdd208a721..03ebf8c7eba 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}
-    [2019/01/24 v1.1.2 Todonotes source and documentation.]
+    [2020/08/18 v1.1.3 Todonotes source and documentation.]
 
 \ProvidesPackage{todonotes}[2018/11/22]
 \RequirePackage{ifthen}
@@ -208,21 +208,21 @@ prior to loading the todonotes package.} \else\fi%
 \fi
 \fi
 
-\newcommand{\@todonotes@currentlinecolor}{}%
-\newcommand{\@todonotes@currentbackgroundcolor}{}%
-\newcommand{\@todonotes@currenttextcolor}{}%
-\newcommand{\@todonotes@currentbordercolor}{}%
+\gdef\@todonotes@currentlinecolor{\@todonotes@linecolor}%
+\gdef\@todonotes@currentbackgroundcolor{\@todonotes@backgroundcolor}%
+\gdef\@todonotes@currenttextcolor{\@todonotes@textcolor}%
+\gdef\@todonotes@currentbordercolor{\@todonotes@bordercolor}%
 \define@key{todonotes}{color}{%
-    \renewcommand{\@todonotes@currentlinecolor}{#1}%
-    \renewcommand{\@todonotes@currentbackgroundcolor}{#1}}%
+    \gdef\@todonotes@currentlinecolor{#1}%
+    \gdef\@todonotes@currentbackgroundcolor{#1}}%
 \define@key{todonotes}{linecolor}{%
-    \renewcommand{\@todonotes@currentlinecolor}{#1}}%
+    \gdef\@todonotes@currentlinecolor{#1}}%
 \define@key{todonotes}{backgroundcolor}{%
-    \renewcommand{\@todonotes@currentbackgroundcolor}{#1}}%
+    \gdef\@todonotes@currentbackgroundcolor{#1}}%
 \define@key{todonotes}{textcolor}{%
-    \renewcommand{\@todonotes@currenttextcolor}{#1}}%
+    \gdef\@todonotes@currenttextcolor{#1}}%
 \define@key{todonotes}{bordercolor}{%
-    \renewcommand{\@todonotes@currentbordercolor}{#1}}%
+    \gdef\@todonotes@currentbordercolor{#1}}%
 \newif\if@todonotes@useshadow%
 \define@key{todonotes}{shadow}[]{\@todonotes@useshadowtrue}%
 \define@key{todonotes}{noshadow}[]{\@todonotes@useshadowfalse}%