luatodonotes (2oct17)

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

3 files changed, 32 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/lualatex/luatodonotes/luatodonotes.pdf b/Master/texmf-dist/doc/lualatex/luatodonotes/luatodonotes.pdf
index c0cef3babc8..3235a373c24 100644
--- a/Master/texmf-dist/doc/lualatex/luatodonotes/luatodonotes.pdf
+++ b/Master/texmf-dist/doc/lualatex/luatodonotes/luatodonotes.pdf
diff --git a/Master/texmf-dist/source/lualatex/luatodonotes/luatodonotes.dtx b/Master/texmf-dist/source/lualatex/luatodonotes/luatodonotes.dtx
index 5c3de40b693..2351cfbf6c3 100644
--- a/Master/texmf-dist/source/lualatex/luatodonotes/luatodonotes.dtx
+++ b/Master/texmf-dist/source/lualatex/luatodonotes/luatodonotes.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2014-2015 by Fabian Lipp <fabian.lipp@gmx.de>
+% Copyright (C) 2014-2017 by Fabian Lipp <fabian.lipp@gmx.de>
 % based on the todonotes package
 %   by Henrik Skov Midtiby <henrikmidtiby@gmail.com>
 % ------------------------------------------------------------
@@ -24,7 +24,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{luatodonotes}
 %<*package>
-    [2015/12/03 v0.3 luatodonotes source and documentation.]
+    [2017/09/30 v0.4 luatodonotes source and documentation.]
 %</package>
 %
 %<*driver>
@@ -32,7 +32,7 @@
 \usepackage{wrapfig}
 \PassOptionsToPackage{colorlinks, urlcolor=blue}{hyperref}
 \usepackage{hypdoc} % this package loads hyperref among others
-\usepackage[colorinlistoftodos, shadow]{luatodonotes}[2015/12/03]
+\usepackage[colorinlistoftodos, shadow]{luatodonotes}[2017/09/30]
 \usepackage{fontspec}
 \usepackage{amsmath}
 \usepackage{setspace}
@@ -51,7 +51,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{905}
+% \CheckSum{906}
 %
 % \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
@@ -77,6 +77,8 @@
 % \changes{0.2}{2015/03/12}{Added troubleshooting section to documentation}
 % \changes{0.3}{2015/12/03}{Incorporated some changes from todonotes (version
 % 1.0.4)}
+% \changes{0.4}{2017/10/01}{Incorporated some changes from todonotes (version
+% 1.0.5)}
 % \GetFileInfo{luatodonotes.dtx}
 %
 % \DoNotIndex{\newcommand,\newenvironment}
@@ -257,7 +259,7 @@
 % The option |obeyFinal| does something similar, except that the 
 % todonotes package is only disabled if the |final| option given.
 %
-% \DescribeMacro{danish, german, ngerman, french, swedish}
+% \DescribeMacro{danish, german, ngerman, english, french, swedish}
 % \DescribeMacro{spanish, catalan, italian}
 % \DescribeMacro{portuguese, dutch, croatian}
 % Use translations of the text strings 
@@ -269,6 +271,7 @@
 % croatian,
 % danish,
 % dutch,
+% english,
 % french,
 % german,
 % ngerman,
@@ -811,10 +814,17 @@
 % \subsubsection{Spacing around inserted notes}
 % Inserted todo commands will eat the white space after the command.
 % \begin{verbatim}
-%Testing\todo{Does this eat the space?} testing
-% \end{verbatim}
-% 
-% Testing\todo{Does this eat the space?}testing
+%Testing\todo{Does this eat the space?} testing.\end{verbatim}
+% \noindent
+% Testing\todo{Does this eat the space?} testing.
+%
+% This can be prevented by adding curly parenthesis after the
+% todo command, like shown below.
+% \begin{verbatim}
+%Testing\todo{Does this eat the space?}{} testing.\end{verbatim}
+% \noindent
+% Testing\todo{Does this eat the space?}{} testing.
+%
 %
 %
 % \subsubsection{Conflicts with the amsart documentclass}
@@ -975,6 +985,7 @@
 \RequirePackage{ifoddpage}
 \RequirePackage{soul}
 \RequirePackage{soulpos}
+\RequirePackage{etoolbox}
 %    \end{macrocode}
 % The package |luatex| must not be loaded in new TeX distributions as the
 % definition of |\newattribute| in it conflicts with newer versions of
@@ -1303,6 +1314,8 @@
 % \begin{macro}{additionalMargin}
 % Control whether the margin should be enlarged for the notes and its width.
 % \changes{0.3}{2015/12/01}{Introduce package option \texttt{additionalMargin}}
+% \changes{0.4}{2016/04/01}{Fixed problems of the \texttt{additionalMargin}
+% option with certain documentclasses}
 %    \begin{macrocode}
 \newif{\if@todonotes@additionalMarginEnabled}
 \@todonotes@additionalMarginEnabledfalse
@@ -1350,11 +1363,12 @@
 \fi
 %    \end{macrocode}
 % If the option |additionalMargin| is given, we enlarge the margins for the notes.
-% We simply increase the page size by the doubled value of |additionalMargin| and move the contents to the right using |\hoffset|.
+% We simply increase the page size by the doubled value of |additionalMargin|
+% and move the contents to the right using |\hoffset|.
 %    \begin{macrocode}
 \if@todonotes@additionalMarginEnabled
     \newlength{\@todonotes@modpaperwidth}
-    \AtBeginDocument{%
+    \AfterEndPreamble{%
         \setlength{\@todonotes@modpaperwidth}{\paperwidth}%
         \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}%
         \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}%
@@ -1638,10 +1652,10 @@
 %    \begin{macrocode}
 \newcommand{\@todonotes@currentfigwidth}{\@todonotes@figwidth}
 \define@key{todonotes}%
-    {figwidth}{\renewcommand{\@todonotes@currentfigwidth}{#1}}
+    {figwidth}{\renewcommand{\@todonotes@currentfigwidth}{#1-2pt}}
 \newcommand{\@todonotes@currentfigheight}{\@todonotes@figheight}
 \define@key{todonotes}%
-    {figheight}{\renewcommand{\@todonotes@currentfigheight}{#1}}
+    {figheight}{\renewcommand{\@todonotes@currentfigheight}{#1-2pt}}
 \newcommand{\@todonotes@currentfigcolor}{\@todonotes@figcolor}
 \define@key{todonotes}%
     {figcolor}{\renewcommand{\@todonotes@currentfigcolor}{#1}}
diff --git a/Master/texmf-dist/tex/lualatex/luatodonotes/luatodonotes.sty b/Master/texmf-dist/tex/lualatex/luatodonotes/luatodonotes.sty
index 8663c610eb8..80d63967175 100644
--- a/Master/texmf-dist/tex/lualatex/luatodonotes/luatodonotes.sty
+++ b/Master/texmf-dist/tex/lualatex/luatodonotes/luatodonotes.sty
@@ -24,7 +24,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{luatodonotes}
-    [2015/12/03 v0.3 luatodonotes source and documentation.]
+    [2017/09/30 v0.4 luatodonotes source and documentation.]
 
 \@ifpackageloaded{todonotes}{
   \PackageError{luatodonotes}{%
@@ -59,6 +59,7 @@
 \RequirePackage{ifoddpage}
 \RequirePackage{soul}
 \RequirePackage{soulpos}
+\RequirePackage{etoolbox}
 \@ifpackagelater{luatexbase}{2013/05/04}{}{
     \RequirePackage{luatex}
 }
@@ -278,7 +279,7 @@
 \fi
 \if@todonotes@additionalMarginEnabled
     \newlength{\@todonotes@modpaperwidth}
-    \AtBeginDocument{%
+    \AfterEndPreamble{%
         \setlength{\@todonotes@modpaperwidth}{\paperwidth}%
         \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}%
         \addtolength{\@todonotes@modpaperwidth}{\@todonotes@additionalMargin}%
@@ -445,10 +446,10 @@
 \define@key{todonotes}{nocaption}[]{\@todonotes@captiongivenfalse}%
 \newcommand{\@todonotes@currentfigwidth}{\@todonotes@figwidth}
 \define@key{todonotes}%
-    {figwidth}{\renewcommand{\@todonotes@currentfigwidth}{#1}}
+    {figwidth}{\renewcommand{\@todonotes@currentfigwidth}{#1-2pt}}
 \newcommand{\@todonotes@currentfigheight}{\@todonotes@figheight}
 \define@key{todonotes}%
-    {figheight}{\renewcommand{\@todonotes@currentfigheight}{#1}}
+    {figheight}{\renewcommand{\@todonotes@currentfigheight}{#1-2pt}}
 \newcommand{\@todonotes@currentfigcolor}{\@todonotes@figcolor}
 \define@key{todonotes}%
     {figcolor}{\renewcommand{\@todonotes@currentfigcolor}{#1}}