From 93209ece09abd2774012c1baa8da93366d0a9e41 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 4 Sep 2012 23:01:28 +0000 Subject: animate (4sep12) git-svn-id: svn://tug.org/texlive/trunk@27591 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/animate/animate.sty | 62 ++++++++++++++----------- 1 file changed, 34 insertions(+), 28 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty index 490008c2922..26d1f564698 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{2012/05/24} +\def\@anim@version{2012/09/03} \ProvidesPackage{animate} [\@anim@version\space PDF animations from files and inline graphics] @@ -130,27 +130,26 @@ \fi \fi -\catcode`\%=11\catcode`\#=14 \edef\@anim@catcode{\the\catcode`\_}\catcode`\_=13 \begingroup\let_\space -\xdef\@anim@dpiwarning{# +\xdef\@anim@dpiwarning{% {Resolution 1200 gt VResolution 1200 gt or product (Ghostscript) - search {pop pop pop true}{pop false}ifelse and {# - (@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\string\n# - @@____Warning:_DVI_resolution_greater_than_1200_dpi!_____@@\string\n# - @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\string\n# - @@_______________________________________________________@@\string\n# - @@_Animations_may_be_distorted_or_invisible._____________@@\string\n# - @@_Dvips_should_be_called_either_without_option_`-Ppdf':_@@\string\n# - @@_______________________________________________________@@\string\n# + search {pop pop pop true}{pop false}ifelse and {% + (@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\string\n% + @@____Warning:_DVI_resolution_greater_than_1200_dpi!_____@@\string\n% + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\string\n% + @@_______________________________________________________@@\string\n% + @@_Animations_may_be_distorted_or_invisible._____________@@\string\n% + @@_Dvips_should_be_called_either_without_option_`-Ppdf':_@@\string\n% + @@_______________________________________________________@@\string\n% @@___dvips_\jobname\string\n - @@_______________________________________________________@@\string\n# - @@_or_with_a_different_resolution_setting:_______________@@\string\n# - @@_______________________________________________________@@\string\n# + @@_______________________________________________________@@\string\n% + @@_or_with_a_different_resolution_setting:_______________@@\string\n% + @@_______________________________________________________@@\string\n% @@___dvips_-Ppdf_-D1200_\jobname\string\n - @@_______________________________________________________@@\string\n# + @@_______________________________________________________@@\string\n% @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\string\n) - (%stderr) (w) file exch writestring} if} ?pdfmark + print} if} ?pdfmark } \endgroup \catcode`\%=14\catcode`\#=6\catcode`\_=\@anim@catcode @@ -1495,6 +1494,7 @@ % #4: first frame (integer) % #5: last frame (integer) \newcommand{\animategraphics}[5][]{% + \@anim@endsanitize% \leavevmode% \ifpdf\else% \if@anim@grxloaded% @@ -1619,6 +1619,9 @@ \endgroup% \global\advance\@anim@num by \@ne% }% +%adjust catcodes of several characters within \animategraphics +\let\@anim@animategraphics\animategraphics +\def\animategraphics{\@anim@sanitize\@anim@animategraphics} %inserts animation and control button widgets \def\@anim@insertwidgets#1#2{%#1:@anim@num, #2 existing btn colour combination @@ -1968,6 +1971,7 @@ % #1: options % #2: frame rate (fps) \newenvironment{animateinline}[2][]{% + \@anim@endsanitize% \leavevmode% \setboolean{@anim@inside}{true}% \@anim@reset% to default settings @@ -2029,6 +2033,8 @@ \global\advance\@anim@num by \@ne% \setboolean{@anim@inside}{false}% } +\let\@anim@animateinline\animateinline +\def\animateinline{\@anim@sanitize\@anim@animateinline} %usercommand for use within `animateinline' environment; %terminates the current frame and starts a new one @@ -2928,15 +2934,15 @@ \define@key{anim@user}{useocg}[true]{% \setboolean{@anim@useocg}{#1}% } -\define@key{anim@user}{firstframejs}{% - \@anim@firstjs{#1}% -} -\define@key{anim@user}{lastframejs}{% - \@anim@lastjs{#1}% -} -\define@key{anim@user}{otherframejs}{% - \@anim@otherjs{#1}% -} +%\define@key{anim@user}{firstframejs}{% +% \@anim@firstjs{#1}% +%} +%\define@key{anim@user}{lastframejs}{% +% \@anim@lastjs{#1}% +%} +%\define@key{anim@user}{otherframejs}{% +% \@anim@otherjs{#1}% +%} %macro to reset macros and booleans \def\@anim@reset{% @@ -2970,9 +2976,9 @@ \gdef\@anim@nfpsat{}% \gdef\@anim@pfpsat{}% \gdef\@anim@usrjsat{}% - \gdef\@anim@firstjs{}% - \gdef\@anim@lastjs{}% - \gdef\@anim@otherjs{}% +% \gdef\@anim@firstjs{}% +% \gdef\@anim@lastjs{}% +% \gdef\@anim@otherjs{}% \gdef\@anim@tmlnfile{}% \setboolean{@anim@timeline}{false}% \global\@anim@begin={}% -- cgit v1.2.3