From 02583fcfe69ff353b8f8eaf69cf340ed8edbb199 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 15 Feb 2016 22:10:08 +0000
Subject: animate (15feb16)

git-svn-id: svn://tug.org/texlive/trunk@39730 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/animate/animate.sty | 49 +++++--------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/animate/animate.sty')

diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty
index 13e8954f0ca..45f5aa79259 100644
--- a/Master/texmf-dist/tex/latex/animate/animate.sty
+++ b/Master/texmf-dist/tex/latex/animate/animate.sty
@@ -13,7 +13,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 
-\def\@anim@version{2016/02/04}
+\def\@anim@version{2016/02/15}
 \ProvidesPackage{animate}
 [\@anim@version\space PDF animations from files and inline graphics]
 
@@ -422,21 +422,21 @@
 %create Form XObject from graphics file
 \def\@anim@ximage#1#2#3#4{%#1:@anim@num, #2:@anim@curframe@zb, #3:filename,
   %#4: page number of multipage file
-  \ifthenelse{\equal{\@anim@fileknown{#3}{#4}}{!}}{%
+  \ifthenelse{\equal{\@anim@fileknown{#3}{#4.\@anim@gropts}}{!}}{%
     \@anim@filebox{#3}{#4}% store file in a box
     \@anim@xinline{#1}{#2}{\@anim@box}{!}% delegate Form XObject creation
     \ifx\@anim@gropts\@empty\if@anim@multipage\message{<#4>}\fi\fi%
-    \@anim@makefileknown{#3}{#4}{\@anim@@lastxform}%
+    \@anim@makefileknown{#3}{#4.\@anim@gropts}{\@anim@@lastxform}%
   }{% file known, re-use existing form xobject
     \setbox\@anim@box=%
-      \hbox to \@anim@xobjnatwd{\@anim@fileknown{#3}{#4}}{%
+      \hbox to \@anim@xobjnatwd{\@anim@fileknown{#3}{#4.\@anim@gropts}}{%
         \vrule width \z@
-          height \@anim@xobjnatht{\@anim@fileknown{#3}{#4}}
-          depth \@anim@xobjnatdp{\@anim@fileknown{#3}{#4}}%
+          height \@anim@xobjnatht{\@anim@fileknown{#3}{#4.\@anim@gropts}}
+          depth \@anim@xobjnatdp{\@anim@fileknown{#3}{#4.\@anim@gropts}}%
           \hss%
       }%
     \@anim@xinline{#1}{#2}{%
-      \@anim@box}{\@anim@fileknown{#3}{#4}}%
+      \@anim@box}{\@anim@fileknown{#3}{#4.\@anim@gropts}}%
   }%
 }
 
@@ -1540,7 +1540,7 @@
     \fi%
     \if@anim@multipage%
       \xdef\@anim@pathtofile{\expandafter\zap@finalspace\@filef@und\@nil}%
-      \@anim@filebox{\@anim@pathtofile}{1}%
+      \pdfximage page 1 {\@anim@pathtofile}%
       \@anim@curframe=\pdflastximagepages%
       \advance\@anim@curframe by -\@ne%since \pdfximagepages is 1-based
       \edef\@anim@lastpage{\the\@anim@curframe}%
@@ -1933,9 +1933,7 @@
     /T (anm#1)%
     /Contents (animation by animate[\@anim@version])%
     /AA <<%
-      /PO <<%
-        /S/JavaScript/JS \@anim@pojscriptobj%
-      >>%
+      /PV <</S/JavaScript/JS \@anim@pojscriptobj>>% PageVisible
       \@anim@otherjscriptkey%
     >>%
     /AP <</N \@anim@apmk>>%
@@ -2059,9 +2057,6 @@
   \ifdefined\NoHyper\NoHyper\fi% silently suppress any hyperref specials
   \let\newframe\@anim@@newframe%
   \let\multiframe\@anim@multiframe%
-  \let\PDFXForm\@gobble% suppress any of these inside `animateinline'
-  \let\PDFRefXForm\@gobble%
-  \let\PDFLastXForm\relax%
   \@anim@beginframe%
   \ignorespaces%
 }{%
@@ -3267,32 +3262,6 @@
   \def\@anim@@method{\@ne}
 \fi\fi
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% useful macros for XObject generation and usage
-% \PDFXForm, \PDFRefXForm, \PDFLastXForm modelled after
-% PDFTeX's builtins \pdfxform, \pdfrefxform, \pdflastxform
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\PDFXForm#1{% #1 box number
-  \begingroup%
-  \edef\@anim@mywd{\the\wd#1}%
-  \edef\@anim@myht{\the\ht#1}%
-  \edef\@anim@mydp{\the\dp#1}%
-  \@anim@reset\@anim@xform{}{0}{#1}%
-  \global\let\PDFLastXForm\@anim@lastxform%
-  \expandafter\xdef\csname xform.\pdfLastXForm.wd\endcsname{\@anim@mywd}%
-  \expandafter\xdef\csname xform.\pdfLastXForm.ht\endcsname{\@anim@myht}%
-  \expandafter\xdef\csname xform.\pdfLastXForm.dp\endcsname{\@anim@mydp}%
-  \endgroup%
-}
-\def\PDFRefXForm#1{% #1 PDF XForm Object identifier
-  \makebox[\csname xform.#1.wd\endcsname][l]{%
-    \rule{0pt}{\csname xform.#1.ht\endcsname}%
-    \rule{0pt}{-\csname xform.#1.dp\endcsname}%
-    \@anim@refxform{#1}%
-  }%
-}%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 %process package options
 \def\@anim@setpkgkeys#1{\setkeys{anim@pkg}{#1}}
 \edef\@anim@pkgopts{{\@ptionlist{\@currname.\@currext}}}
-- 
cgit v1.2.3

