animate (22jan15)

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

1 files changed, 52 insertions, 42 deletions

diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty
index 0c76a2a872e..b0ed13e2baa 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{2014/12/04}
+\def\@anim@version{2015/01/21}
 \ProvidesPackage{animate}
 [\@anim@version\space PDF animations from files and inline graphics]
 
@@ -136,7 +136,7 @@
    @@____Warning:_DVI_resolution_greater_than_1200_dpi!_____@@\string\n%
    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\string\n%
    @@_______________________________________________________@@\string\n%
-   @@_Animation_frames_may_be_badly_scaled,_clipped_or______@@\string\n%
+   @@_Animation_frames_may_be_poorly_scaled,_clipped_or_____@@\string\n%
    @@_invisible.____________________________________________@@\string\n%
    @@_______________________________________________________@@\string\n%
    @@_Dvips_should_be_called_either_without_option_`-Ppdf':_@@\string\n%
@@ -237,8 +237,9 @@
 %PDF Catalog
 \def\@anim@appearances{}
 \ifdefined\@anim@fields\else\def\@anim@fields{}\fi %takes Field object refs
-\ifdefined\@anim@ocgs\else\def\@anim@ocgs{}\fi %takes ocg object refs
-\ifdefined\@anim@offocgs\else\def\@anim@offocgs{}\fi
+\ifdefined\@ocgbase@ocgs\else\def\@ocgbase@ocgs{}\fi %takes ocg object refs
+\ifdefined\@ocgbase@offocgs\else\def\@ocgbase@offocgs{}\fi
+\ifdefined\@ocgbase@ocgorder\else\def\@ocgbase@ocgorder{}\fi
 \ifpdf
   %Appearance name tree
   \AtEndDvi{%
@@ -264,20 +265,23 @@
   %OCProperties dict
   \ifdefined\oc@props@added\else%
     \AtEndDvi{%
-      \ifx\empty\@anim@ocgs\empty\else%
-        \immediate\pdfobj{[\@anim@ocgs]}%
-        \edef\@anim@@ocgs{\the\pdflastobj}%
-        \immediate\pdfobj{[\@anim@offocgs]}%
-        \edef\@anim@@offocgs{\the\pdflastobj}%
+      \ifx\empty\@ocgbase@ocgs\empty\else%
+        \immediate\pdfobj{[\@ocgbase@ocgs]}%
+        \edef\@ocgbase@@ocgs{\the\pdflastobj}%
+        \immediate\pdfobj{[\@ocgbase@offocgs]}%
+        \edef\@ocgbase@@offocgs{\the\pdflastobj}%
+        \immediate\pdfobj{[\@ocgbase@ocgorder]}%
+        \edef\@ocgbase@@ocgorder{\the\pdflastobj}%
         \pdfcatalog{%
           /OCProperties <<%
-            /OCGs \@anim@@ocgs\space 0 R%
+            /OCGs \@ocgbase@@ocgs\space 0 R%
             /D <<%
-              /BaseState/ON /OFF \@anim@@offocgs\space 0 R%
+              /BaseState/ON /OFF \@ocgbase@@offocgs\space 0 R%
+              /Order \@ocgbase@@ocgorder\space 0 R/ListMode/VisiblePages%
               /AS [%
-                <</Event/View  /Category[/View]  /OCGs \@anim@@ocgs\space 0 R>>%
-                <</Event/Print /Category[/Print] /OCGs \@anim@@ocgs\space 0 R>>%
-                <</Event/Export/Category[/Export]/OCGs \@anim@@ocgs\space 0 R>>%
+                <</Event/View  /Category[/View]  /OCGs \@ocgbase@@ocgs\space 0 R>>%
+                <</Event/Print /Category[/Print] /OCGs \@ocgbase@@ocgs\space 0 R>>%
+                <</Event/Export/Category[/Export]/OCGs \@ocgbase@@ocgs\space 0 R>>%
               ]%
             >>%
           >>%
@@ -311,20 +315,23 @@
     \fi%
     \ifdefined\oc@props@added\else%
       \AtEndDvi{%
-        \ifx\empty\@anim@ocgs\empty\else%
-          \special{pdf:obj @anim@ocgs []}%
-          \special{pdf:put @anim@ocgs \@anim@ocgs}%
-          \special{pdf:obj @anim@offocgs []}%
-          \special{pdf:put @anim@offocgs \@anim@offocgs}%
+        \ifx\empty\@ocgbase@ocgs\empty\else%
+          \special{pdf:obj @ocgbase@ocgs []}%
+          \special{pdf:put @ocgbase@ocgs \@ocgbase@ocgs}%
+          \special{pdf:obj @ocgbase@offocgs []}%
+          \special{pdf:put @ocgbase@offocgs \@ocgbase@offocgs}%
+          \special{pdf:obj @ocgbase@ocgorder []}%
+          \special{pdf:put @ocgbase@ocgorder \@ocgbase@ocgorder}%
           \special{pdf:put @catalog <<%
             /OCProperties <<%
-              /OCGs @anim@ocgs%
+              /OCGs @ocgbase@ocgs%
               /D <<%
-                /BaseState/ON /OFF @anim@offocgs%
+                /BaseState/ON /OFF @ocgbase@offocgs%
+                /Order @ocgbase@ocgorder /ListMode/VisiblePages%
                 /AS[%
-                  <</Event/View  /Category[/View]  /OCGs @anim@ocgs>>%
-                  <</Event/Print /Category[/Print] /OCGs @anim@ocgs>>%
-                  <</Event/Export/Category[/Export]/OCGs @anim@ocgs>>%
+                  <</Event/View  /Category[/View]  /OCGs @ocgbase@ocgs>>%
+                  <</Event/Print /Category[/Print] /OCGs @ocgbase@ocgs>>%
+                  <</Event/Export/Category[/Export]/OCGs @ocgbase@ocgs>>%
                 ]%
               >>%
             >>%
@@ -341,7 +348,7 @@
           mark {@anim@appearances} 0 [\@anim@appearances] /PUTINTERVAL pdfmark
           mark {Catalog} <<%
             /Names <</AP <</Names {@anim@appearances}>> >>
-          >> /PUT pdfmark%
+          >> /PUT pdfmark
         }%
       \fi%
     }%
@@ -353,7 +360,7 @@
             mark {@anim@fields} 0 [\@anim@fields] /PUTINTERVAL pdfmark
             mark {Catalog} <<%
               /AcroForm <</Fields {@anim@fields} /NeedAppearances false>>
-            >> /PUT pdfmark%
+            >> /PUT pdfmark
           }%
         \fi%
       }%
@@ -361,25 +368,28 @@
     \fi%
     \ifdefined\oc@props@added\else%
       \AtEndDvi{%
-        \ifx\empty\@anim@ocgs\empty\else%
+        \ifx\empty\@ocgbase@ocgs\empty\else%
           \special{ps:
-            mark /_objdef {@anim@ocgs} /type/array /OBJ pdfmark
-            mark {@anim@ocgs} 0 [\@anim@ocgs] /PUTINTERVAL pdfmark
-            mark /_objdef {@anim@offocgs} /type/array /OBJ pdfmark
-            mark {@anim@offocgs} 0 [\@anim@offocgs] /PUTINTERVAL pdfmark
+            mark /_objdef {@ocgbase@ocgs} /type/array /OBJ pdfmark
+            mark {@ocgbase@ocgs} 0 [\@ocgbase@ocgs] /PUTINTERVAL pdfmark
+            mark /_objdef {@ocgbase@offocgs} /type/array /OBJ pdfmark
+            mark {@ocgbase@offocgs} 0 [\@ocgbase@offocgs] /PUTINTERVAL pdfmark
+            mark /_objdef {@ocgbase@ocgorder} /type/array /OBJ pdfmark
+            mark {@ocgbase@ocgorder} 0 [\@ocgbase@ocgorder] /PUTINTERVAL pdfmark
             mark {Catalog} <<%
               /OCProperties <<%
-                /OCGs {@anim@ocgs}%
+                /OCGs {@ocgbase@ocgs}%
                 /D <<%
-                  /BaseState/ON /OFF {@anim@offocgs}%
+                  /BaseState/ON /OFF {@ocgbase@offocgs}%
+                  /Order {@ocgbase@ocgorder} /ListMode/VisiblePages%
                   /AS[%
-                    <</Event/View  /Category[/View]  /OCGs {@anim@ocgs}>>%
-                    <</Event/Print /Category[/Print] /OCGs {@anim@ocgs}>>%
-                    <</Event/Export/Category[/Export]/OCGs {@anim@ocgs}>>%
+                    <</Event/View  /Category[/View]  /OCGs {@ocgbase@ocgs}>>%
+                    <</Event/Print /Category[/Print] /OCGs {@ocgbase@ocgs}>>%
+                    <</Event/Export/Category[/Export]/OCGs {@ocgbase@ocgs}>>%
                   ]%
                 >>%
               >>%
-            >> /PUT pdfmark%
+            >> /PUT pdfmark
           }%
         \fi%
       }%
@@ -721,7 +731,7 @@
           }{% flip around horizontal axis in portrait mode
             [1 0 0 -1 0 frame@lly frame@ury add] concat%
           }ifelse
-        }?pdfmark%
+        }?pdfmark
         \fi%
       }%
       \rlap{\vbox to \z@{\vss\box#3}}%
@@ -736,7 +746,7 @@
       \special{ps:
         currentpoint pop \@anim@getkeyval{origin:#1} pop sub
         currentpoint exch pop \@anim@getkeyval{origin:#1} exch pop sub translate
-        mark #1 /SP pdfmark%
+        mark #1 /SP pdfmark
       }%
     }
 
@@ -835,7 +845,7 @@
   \@anim@dictobj{/Type/OCG /Name (#1.#2)}%
   \xdef\@anim@curocg{\@anim@lastobj}%
   %append to ocg array
-  \xdef\@anim@ocgs{\@anim@ocgs\space\@anim@curocg}%
+  \xdef\@ocgbase@ocgs{\@ocgbase@ocgs\space\@anim@curocg}%
 }
 
 %inserts one animation frame into the output acc. to
@@ -901,11 +911,11 @@
     \ifnum\@anim@poster=\@anim@mone% use last frame as poster
       \@anim@keytoaux{a#1.poster}{#2}%
       \ifthenelse{\equal{\@anim@getkeyval{a#1.poster}}{#2}}{}{%
-        \xdef\@anim@offocgs{\@anim@offocgs\space\@anim@curocg}%
+        \xdef\@ocgbase@offocgs{\@ocgbase@offocgs\space\@anim@curocg}%
       }%
     \else%
       \ifnum#2=\@anim@poster\else%
-        \xdef\@anim@offocgs{\@anim@offocgs\space\@anim@curocg}%
+        \xdef\@ocgbase@offocgs{\@ocgbase@offocgs\space\@anim@curocg}%
       \fi%
     \fi%
     \def\@anim@needresize{0}%