From 5ce1b52d548d7e90a8e6d1c99b90312a34c3b096 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 Apr 2016 21:34:30 +0000 Subject: animate (15apr16) git-svn-id: svn://tug.org/texlive/trunk@40534 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/animate/animate.sty | 28 +++++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/latex/animate') diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty index 8aabe545d87..521523cd84c 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/03/22} +\def\@anim@version{2016/04/15} \ProvidesPackage{animate} [\@anim@version\space PDF animations from files and inline graphics] @@ -425,13 +425,22 @@ %keep a record of XObject number \@anim@newkey{img@#2}{\@anim@lastxform}% \if@anim@timeline\else% - \@anim@newkey{frmcontent@#2}{% - \noexpand\@anim@refxform{\@anim@getkeyval{img@#2}}% - }% + \@anim@newkey{frmcontent@#2}{\@anim@getkeyval{img@#2},}% \@anim@makeframe{#1}{#2}% \fi% } +\def\@anim@insertfrmcontent#1,#2\@nil{% + \ifthenelse{\equal{#1}{}}{}{% + \if@anim@dvips% + \@anim@refxform{{#1}}% + \else% + \@anim@refxform{#1}% + \fi% + }% + \ifthenelse{\equal{#2}{}}{}{\@anim@insertfrmcontent#2\@nil}% +} + %inserts one animation frame into the output acc. to % \ifcase\@anim@method as % 0: Form XObject (not referenced in the page content stream) @@ -440,9 +449,10 @@ % animation \def\@anim@makeframe#1#2{% %container box + \edef\@anim@tmpvar{\@anim@getkeyval{frmcontent@#2},}% \global\setbox\@anim@box=\hbox to \@anim@zframewd{% \vrule width \z@ height \@anim@zframeht depth \@anim@zframedp% - \@anim@getkeyval{frmcontent@#2}% + \expandafter\@anim@insertfrmcontent\@anim@tmpvar\@nil% \hss% }% \ifcase\@anim@method% icon based @@ -2314,7 +2324,7 @@ \edef\@anim@tmpvar{\@anim@getkeyval{% layercontent@\the\@anim@tmpcnt.\the\@anim@curlayer}}% \@anim@newkey{layercontent@\the\@anim@tmpcnt.\the\@anim@curlayer}{% - \@anim@tmpvar\noexpand\@anim@refxform{\@anim@getkeyval{img@#1}}% + \@anim@tmpvar\@anim@getkeyval{img@#1},% }% %append transp. to list of transparencies used in the current layer \edef\@anim@tmpvar{\@anim@getkeyval{% @@ -2447,7 +2457,7 @@ \gdef\@anim@colour{}% \@anim@colours#1:\@nil% \xdef\@anim@bgcolour{\@anim@colour}% - \if@anim@dvips + \if@anim@dvips% \ifnum\@anim@tmpcnt=\@ne\relax% \xdef\@anim@bg{\@anim@colour\space setgray}% \else% @@ -2478,7 +2488,7 @@ \gdef\@anim@colour{}% \@anim@colours#1:\@nil% \xdef\@anim@fgcolour{\@anim@colour}% - \if@anim@dvips + \if@anim@dvips% \ifnum\@anim@tmpcnt=\@ne\relax% \xdef\@anim@fg{\@anim@colour\space setgray}% \else% @@ -2727,7 +2737,7 @@ \gdef\@anim@colour{}% \@anim@colours#1:\@nil% \xdef\@anim@@bgcolour{\@anim@colour}% - \if@anim@dvips + \if@anim@dvips% \ifnum\@anim@tmpcnt=\@ne\relax% \xdef\@anim@@bg{\@anim@colour\space setgray}% \else% -- cgit v1.2.3