luatodonotes (2oct17)

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

1 files changed, 5 insertions, 4 deletions

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}}