animate update (17aug09)

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

1 files changed, 14 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty
index 9612cda4058..aa13209b969 100644
--- a/Master/texmf-dist/tex/latex/animate/animate.sty
+++ b/Master/texmf-dist/tex/latex/animate/animate.sty
@@ -12,7 +12,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\def\@anim@version{2009/07/23}
+\def\@anim@version{2009/08/17}
 \ProvidesPackage{animate}
 [\@anim@version\space PDF animations from files and inline graphics]
 
@@ -1261,8 +1261,8 @@
 \newcount\@anim@curframe
 \newcount\@anim@curframe@zb %zero based
 
-%draftbox from savebox
-\def\@anim@draftbox#1{% #1: box number
+%draftbox
+\def\@anim@draftbox{%
   \begingroup%
   \setlength{\unitlength}{1pt}%
   \vtop{% draw boxes
@@ -1487,7 +1487,7 @@
     \@anim@getsize{\@anim@box}%
     \@anim@scale{\@anim@box}%
     %draw draftbox according to dimensions of the first frame
-    \@anim@draftbox{\@anim@box}%
+    \@anim@draftbox%
   \else%
     \if@anim@controls%
       %create button faces only once in the current colour combination
@@ -1597,6 +1597,7 @@
 %into account
 \newcount\@anim@resize% resizing flags according to options given
 \def\@anim@scale#1{%
+  \begingroup%
   %natural dimensions \width, \height, \depth, \totalheight
   \def\width{\wd#1}%
   \def\height{\ht#1}%
@@ -1661,6 +1662,7 @@
   \setlength{\@anim@tmpdima}{\@anim@animheight\p@}%
   \addtolength{\@anim@tmpdima}{\@anim@animdepth\p@}%
   \xdef\@anim@animtotalheight{\strip@pt\@anim@tmpdima}%
+  \endgroup%
 }
 
 %interactive Widget annotation that is overlayed on the non-interactive
@@ -1793,7 +1795,6 @@
 \ifpdf
   \def\@anim@buttonwidget#1#2#3{%#1:@anim@num, #2:action, #3:button face XObject
     \@anim@upjscript{#1}{#2}% JavaScript actions for ButtonUp events
-    %button size corresponds to current font size
     \setlength{\@anim@tmpdima}{\@anim@btnsize}%
     \hbox to \@anim@tmpdima {%
       \pdfannot
@@ -2081,7 +2082,7 @@
       \fi%
       \@anim@scale{\@anim@box}%
       %draw draftbox according to dimensions of the first frame
-      \if@anim@draft\@anim@draftbox{\@anim@box}\fi%
+      \if@anim@draft\@anim@draftbox\fi%
     \fi%
     %now create Form XObject of box contents
     \if@anim@draft\else%
@@ -2309,12 +2310,12 @@
           \@anim@getkeyval{frmxobject@\the\@anim@curframe@zb}%
           \@anim@getkeyval{%
             layerxobject@\the\@anim@curframe@zb.\the\@anim@curlayer}%
-		}%
+        }%
         \@anim@newkey{trlst@\the\@anim@curframe@zb}{%
           \@anim@getkeyval{trlst@\the\@anim@curframe@zb}%
           \@anim@getkeyval{%
-		    layertrlst@\the\@anim@curframe@zb.\the\@anim@curlayer}%
-		}%
+            layertrlst@\the\@anim@curframe@zb.\the\@anim@curlayer}%
+        }%
         \@anim@newkey{%
           layercontent@\the\@anim@curframe@zb.\the\@anim@curlayer}{}%
         \@anim@newkey{%
@@ -2499,7 +2500,7 @@
         \repeat%
       \fi%
     \fi%
-  }%	
+  }%
 }
 
 %detects multiple inclusion of the same transparency
@@ -2744,15 +2745,15 @@
   \ifnum#1<\@ne\gdef\@anim@every{1}\else\gdef\@anim@every{#1}\fi%
 }
 \define@key{anim@user}{bb}{%
-  \if@anim@grxloaded\xdef\@anim@gropts{\@anim@gropts, bb=#1}%
+  \if@anim@grxloaded\g@addto@macro\@anim@gropts{, bb=#1}%
   \else\@anim@missing{graphicx}\fi%
 }
 \define@key{anim@user}{viewport}{%
-  \if@anim@grxloaded\xdef\@anim@gropts{\@anim@gropts, viewport=#1}%
+  \if@anim@grxloaded\g@addto@macro\@anim@gropts{, viewport=#1}%
   \else\@anim@missing{graphicx}\fi%
 }
 \define@key{anim@user}{trim}{%
-  \if@anim@grxloaded\xdef\@anim@gropts{\@anim@gropts, trim=#1}%
+  \if@anim@grxloaded\g@addto@macro\@anim@gropts{, trim=#1}%
   \else\@anim@missing{graphicx}\fi%
 }
 \newboolean{@anim@meas}