summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-03-25 21:27:10 +0000
committerKarl Berry <karl@freefriends.org>2014-03-25 21:27:10 +0000
commited18618d5ba20315c34cc8fe58e4989b5de500ed (patch)
tree1bc0012652c200603ca05f027baa6dc6e3d2c8ab
parentf56a041d65758ee14f02b26d2a33524ea45617d0 (diff)
animate (25mar14)
git-svn-id: svn://tug.org/texlive/trunk@33287 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/animate/ChangeLog4
-rw-r--r--Master/texmf-dist/doc/latex/animate/animate.pdfbin3706445 -> 3696671 bytes
-rw-r--r--Master/texmf-dist/doc/latex/animate/animate.tex4
-rw-r--r--Master/texmf-dist/tex/latex/animate/animate.sty154
4 files changed, 80 insertions, 82 deletions
diff --git a/Master/texmf-dist/doc/latex/animate/ChangeLog b/Master/texmf-dist/doc/latex/animate/ChangeLog
index 3337726e59e..723d0406649 100644
--- a/Master/texmf-dist/doc/latex/animate/ChangeLog
+++ b/Master/texmf-dist/doc/latex/animate/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-25
+ * fix: bugs related to AcroForm and OCProperties catalog entries;
+ documenation
+
2014-03-12
* Fix: incompatibility with pgf-3.0
diff --git a/Master/texmf-dist/doc/latex/animate/animate.pdf b/Master/texmf-dist/doc/latex/animate/animate.pdf
index 41d7eaed01c..e3f2910fb0e 100644
--- a/Master/texmf-dist/doc/latex/animate/animate.pdf
+++ b/Master/texmf-dist/doc/latex/animate/animate.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/animate/animate.tex b/Master/texmf-dist/doc/latex/animate/animate.tex
index 6131abf9dea..3cac96013ea 100644
--- a/Master/texmf-dist/doc/latex/animate/animate.tex
+++ b/Master/texmf-dist/doc/latex/animate/animate.tex
@@ -1141,7 +1141,7 @@ dt dt Tm nT mul { % pop
width=1ex,height=1ex,
label=click,
addresource=click.mp3,
- activate=pageopen,transparent,
+ activate=pageopen,transparent,noplaybutton,
flashvars={source=click.mp3&hideBar=true}
]{}{APlayer.swf}}%
%animated metronome
@@ -1211,7 +1211,7 @@ dt dt Tm nT mul { % pop
width=1ex,height=1ex,
label=click,
addresource=click.mp3,
- activate=pageopen,transparent,
+ activate=pageopen,transparent,noplaybutton,
flashvars={source=click.mp3&hideBar=true}
]{}{APlayer.swf}}%
%
diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty
index 68c61f05089..6c9dbcc4854 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/03/21}
+\def\@anim@version{2014/03/25}
\ProvidesPackage{animate}
[\@anim@version\space PDF animations from files and inline graphics]
@@ -33,6 +33,7 @@
\RequirePackage{ifluatex}
\RequirePackage{ifdraft}
\RequirePackage{calc}
+\RequirePackage{atenddvi}%to really get certain \specials into the dvi
\RequirePackage{animfp}
\newboolean{@anim@powerdot} %to cope with some powerdot oddity
@@ -232,16 +233,13 @@
%AcroForm dict
\def\@anim@acroform{%
\ifdefined\Acro@Form@added\else%
- \newcount\@anim@@fields%
- \pdfobj reserveobjnum%
- \global\@anim@@fields=\pdflastobj%
- \pdfcatalog{%
- /AcroForm <</Fields \the\@anim@@fields\space 0 R /NeedAppearances false>>%
- }%
- \AtEndDocument{%
- \immediate\pdfobj useobjnum \@anim@@fields {%
- [\@anim@fields]%
- }%
+ \AtEndDvi{%
+ \ifx\empty\@anim@fields\empty\else%
+ \immediate\pdfobj{[\@anim@fields]}%
+ \pdfcatalog{%
+ /AcroForm <</Fields \the\pdflastobj\space 0 R /NeedAppearances false>>%
+ }%
+ \fi%
}%
\gdef\Acro@Form@added{}%
\fi%
@@ -249,27 +247,21 @@
%OCProperties dict
\def\@anim@ocprops{%
\ifdefined\oc@props@added\else%
- \newcount\@anim@@ocgs%
- \pdfobj reserveobjnum%
- \global\@anim@@ocgs=\pdflastobj%
- \newcount\@anim@@offocgs%
- \pdfobj reserveobjnum%
- \global\@anim@@offocgs=\pdflastobj%
- \pdfcatalog{%
- /OCProperties <<%
- /OCGs \the\@anim@@ocgs\space 0 R%
- /D <<%
- /BaseState/ON /OFF \the\@anim@@offocgs\space 0 R%
- >>%
- >>%
- }%
- \AtEndDocument{%
- \immediate\pdfobj useobjnum \@anim@@ocgs {%
- [\@anim@ocgs]%
- }%
- \immediate\pdfobj useobjnum \@anim@@offocgs {%
- [\@anim@offocgs]%
- }%
+ \AtEndDvi{%
+ \ifx\empty\@anim@ocgs\empty\else%
+ \immediate\pdfobj{[\@anim@ocgs]}%
+ \edef\@anim@@ocgss{\the\pdflastobj}%
+ \immediate\pdfobj{[\@anim@offocgs]}%
+ \edef\@anim@@offocgs{\the\pdflastobj}%
+ \pdfcatalog{%
+ /OCProperties <<%
+ /OCGs \@anim@@ocgs\space 0 R%
+ /D <<%
+ /BaseState/ON /OFF \@anim@@offocgs\space 0 R%
+ >>%
+ >>%
+ }%
+ \fi%
}%
\gdef\oc@props@added{}%
\fi%
@@ -280,29 +272,33 @@
\if@anim@@dvipdfmx
\def\@anim@acroform{%
\ifdefined\Acro@Form@added\else%
- %array which takes refs to all widget annotations
- \special{pdf:obj @anim@fields [ ]}%
- \special{pdf:put @catalog <<%
- /AcroForm <</Fields @anim@fields /NeedAppearances false>>>>}%
- \AtEndDocument{%
- \special{pdf:put @anim@fields \@anim@fields}%
+ \AtEndDvi{%
+ \ifx\empty\@anim@fields\empty\else%
+ %array which takes refs to all widget annotations
+ \special{pdf:obj @anim@fields []}%
+ \special{pdf:put @anim@fields \@anim@fields}%
+ \special{pdf:put @catalog <<%
+ /AcroForm <</Fields @anim@fields /NeedAppearances false>>>>}%
+ \fi%
}%
\gdef\Acro@Form@added{}%
\fi%
}
\def\@anim@ocprops{%
\ifdefined\oc@props@added\else%
- \special{pdf:obj @anim@ocgs [ ]}%
- \special{pdf:obj @anim@offocgs [ ]}%
- \special{pdf:put @catalog <<%
- /OCProperties <<%
- /OCGs @anim@ocgs
- /D <</BaseState/ON /OFF @anim@offocgs>>
- >>%
- >>}%
- \AtEndDocument{%
- \special{pdf:put @anim@ocgs \@anim@ocgs}%
- \special{pdf:put @anim@offocgs \@anim@offocgs}%
+ \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}%
+ \special{pdf:put @catalog <<%
+ /OCProperties <<%
+ /OCGs @anim@ocgs
+ /D <</BaseState/ON /OFF @anim@offocgs>>
+ >>%
+ >>}%
+ \fi%
}%
\gdef\oc@props@added{}%
\fi%
@@ -310,35 +306,37 @@
\else
\def\@anim@acroform{%
\ifdefined\Acro@Form@added\else%
- \special{ps:
- mark /_objdef {@anim@fields} /type/array /OBJ pdfmark
- mark {Catalog} <<%
- /AcroForm <</Fields {@anim@fields} /NeedAppearances false>>
- >> /PUT pdfmark%
- }%
- \AtEndDocument{%
- \special{ps: mark {@anim@fields} 0 [\@anim@fields] /PUTINTERVAL pdfmark}%
+ \AtEndDvi{%
+ \ifx\empty\@anim@fields\empty\else%
+ \special{ps:
+ mark /_objdef {@anim@fields} /type/array /OBJ pdfmark
+ mark {@anim@fields} 0 [\@anim@fields] /PUTINTERVAL pdfmark
+ mark {Catalog} <<%
+ /AcroForm <</Fields {@anim@fields} /NeedAppearances false>>
+ >> /PUT pdfmark%
+ }%
+ \fi%
}%
\gdef\Acro@Form@added{}%
\fi%
}
\def\@anim@ocprops{%
\ifdefined\oc@props@added\else%
- \special{ps:
- mark /_objdef {@anim@ocgs} /type/array /OBJ pdfmark
- mark /_objdef {@anim@offocgs} /type/array /OBJ pdfmark
- mark {Catalog} <<%
- /OCProperties <<%
- /OCGs {@anim@ocgs}%
- /D <</BaseState/ON /OFF {@anim@offocgs}>>%
- >>%
- >> /PUT pdfmark%
- }%
- \AtEndDocument{%
- \special{ps:
- mark {@anim@ocgs} 0 [\@anim@ocgs] /PUTINTERVAL pdfmark
- mark {@anim@offocgs} 0 [\@anim@offocgs] /PUTINTERVAL pdfmark
- }%
+ \AtEndDvi{%
+ \ifx\empty\@anim@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 {Catalog} <<%
+ /OCProperties <<%
+ /OCGs {@anim@ocgs}%
+ /D <</BaseState/ON /OFF {@anim@offocgs}>>%
+ >>%
+ >> /PUT pdfmark%
+ }%
+ \fi%
}%
\gdef\oc@props@added{}%
\fi%
@@ -614,14 +612,12 @@
\xdef\@anim@curocg{\the\pdflastobj\space 0 R}%
%append to ocg array
\xdef\@anim@ocgs{\@anim@ocgs\space\@anim@curocg}%
- \@anim@ocprops%
}
\else
\if@anim@@dvipdfmx
\def\@anim@newocg#1#2{%
\special{pdf:obj @anim@ocg@#1@#2 <</Type/OCG /Name (#1.#2)>>}%
\xdef\@anim@ocgs{\@anim@ocgs\space @anim@ocg@#1@#2}%
- \@anim@ocprops%
}
\else
\def\@anim@newocg#1#2{%
@@ -630,7 +626,6 @@
mark {@anim@ocg@#1@#2} <</Type/OCG /Name (#1.#2)>> /PUT pdfmark
}%
\xdef\@anim@ocgs{\@anim@ocgs\space {@anim@ocg@#1@#2}}%
- \@anim@ocprops%
}
\fi
\fi
@@ -1608,7 +1603,6 @@
\fi%
\endgroup%
\global\advance\@anim@num by \@ne%
- \@anim@acroform%
}%
%adjust catcodes of several characters within \animategraphics
\let\@anim@animategraphics\animategraphics
@@ -2069,7 +2063,6 @@
\endgroup%
\global\advance\@anim@num by \@ne%
\setboolean{@anim@inside}{false}%
- \@anim@acroform%
}
\let\@anim@animateinline\animateinline
\def\animateinline{\@anim@sanitize\@anim@animateinline}
@@ -3290,8 +3283,9 @@
var old=a#1.idx;a#1.idx=f;%
\if@anim@usrjs
if(a#1.usrJSat[f]){%
- var ret=app.setTimeOut('try{a#1.usrJSat[a#1.idx]();}catch(e){%
- console.show();console.println(e);}',1);%
+ var cmd='try{a#1.usrJSat['+f+']();}catch(e){%
+ console.show();console.println(e);}';%
+ var ret=app.setTimeOut(cmd,1);%
}%
\fi%
\if@anim@useocg
@@ -3678,4 +3672,4 @@
\fi\fi\fi\fi\fi\fi\fi\fi\fi%
}%
}
-\ifpdf\else\@anim@acroform\@anim@ocprops\fi
+\@anim@acroform\@anim@ocprops