animate (16sep11)

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

1 files changed, 27 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty
index 068a8ab85a9..4510e96e7f7 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{2011/08/22}
+\def\@anim@version{2011/09/16}
 \ProvidesPackage{animate}
 [\@anim@version\space PDF animations from files and inline graphics]
 
@@ -33,11 +33,18 @@
 \RequirePackage{calc}
 \RequirePackage{animfp}
 
-%driver options (the only package options we process immediately)
+\newboolean{@anim@powerdot} %to cope with some powerdot oddity
+\setboolean{@anim@powerdot}{false}
+\@ifclassloaded{powerdot}{\setboolean{@anim@powerdot}{true}}{}%
+
+%driver options + powerdot's `clock' option (the only package options
+%we process immediately)
 \newboolean{@anim@@dvips}
 \setboolean{@anim@@dvips}{false}
 \newboolean{@anim@@dvipdfmx}
 \setboolean{@anim@@dvipdfmx}{false}
+\newboolean{@anim@pdclock} %for compatibility with powerdot
+\setboolean{@anim@pdclock}{false}
 \ifpdf\else
   \setboolean{@anim@@dvips}{true}% default dvi mode
   \setboolean{@anim@@dvipdfmx}{false}
@@ -53,6 +60,9 @@
     \setboolean{@anim@@dvipdfmx}{true}
     \setboolean{@anim@@dvips}{false}
   }
+  \DeclareOption{clock}{% for global `clock' option given to powerdot
+    \setboolean{@anim@pdclock}{true}
+  }
 \fi
 \newboolean{@anim@xetex}
 \setboolean{@anim@xetex}{false}
@@ -192,10 +202,6 @@
   }{}%
 }
 
-\newboolean{@anim@powerdot} %to cope with some powerdot oddity
-\setboolean{@anim@powerdot}{false}
-\@ifclassloaded{powerdot}{\setboolean{@anim@powerdot}{true}}{}%
-
 \newboolean{@anim@grxloaded}
 \setboolean{@anim@grxloaded}{false}
 \AtBeginDocument{%
@@ -265,18 +271,28 @@
       >>
     >>}
   \else
+	\def\@anim@fields{@anim@fields}
+    \if@anim@powerdot\if@anim@pdclock
+	  \def\@anim@fields{afields}
+	\fi\fi
     \special{ps:
-      mark /_objdef {@anim@fields} /type/array /OBJ pdfmark
       mark /_objdef {@anim@ocgs} /type/array /OBJ pdfmark
       mark /_objdef {@anim@posterocgs} /type/array /OBJ pdfmark
       mark {Catalog} <<
-        /AcroForm <</Fields {@anim@fields}>>
         /OCProperties <<
           /OCGs {@anim@ocgs}
           /D <</BaseState/OFF /ON {@anim@posterocgs}>>
         >>
       >> /PUT pdfmark
     }
+	\ifthenelse{\boolean{@anim@powerdot}\AND\boolean{@anim@pdclock}}{}{
+      \special{ps:
+        mark /_objdef {\@anim@fields} /type/array /OBJ pdfmark
+        mark {Catalog} <<
+          /AcroForm <</Fields {\@anim@fields}>>
+        >> /PUT pdfmark
+      }
+	}  
   \fi
 \fi
 
@@ -741,7 +757,7 @@
           /AP <</N {@anim@anmfrm@#1@#2}>>%
           /T (#1.#2)%
         /ANN pdfmark
-        mark {@anim@fields} {annot@\the\@anim@fieldnum} /APPEND pdfmark
+        mark {\@anim@fields} {annot@\the\@anim@fieldnum} /APPEND pdfmark
       }%
       \global\advance\@anim@fieldnum by \@ne%
     }
@@ -1821,7 +1837,7 @@
             \@anim@otherjscriptkey%
           >>%
         /ANN pdfmark
-        mark {@anim@fields} {annot@\the\@anim@fieldnum} /APPEND pdfmark
+        mark {\@anim@fields} {annot@\the\@anim@fieldnum} /APPEND pdfmark
       }%
       \global\advance\@anim@fieldnum by \@ne%
       \hbox to \@anim@animwidth\p@ {%
@@ -1914,7 +1930,7 @@
           \@anim@tooltip%
           /A <</S/JavaScript/JS (\@anim@upjscriptstring)>>%
         /ANN pdfmark
-        mark {@anim@fields} {annot@\the\@anim@fieldnum} /APPEND pdfmark
+        mark {\@anim@fields} {annot@\the\@anim@fieldnum} /APPEND pdfmark
       }%
       \global\advance\@anim@fieldnum by \@ne%
       \hbox to \the\@anim@tmpdima {%