summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/animate
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-08-18 23:06:52 +0000
committerKarl Berry <karl@freefriends.org>2015-08-18 23:06:52 +0000
commit950cdbf0a9c54c596fc1c0122cf75a0c43b58470 (patch)
treed41c5de3b6dea0a0bba2137fe83bf07c6a75e3b4 /Master/texmf-dist/tex/latex/animate
parenta34df050b05410fa49eae6987d7102c8276de4d0 (diff)
animate (18aug15)
git-svn-id: svn://tug.org/texlive/trunk@38149 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/animate')
-rw-r--r--Master/texmf-dist/tex/latex/animate/animate.sty44
1 files changed, 24 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty
index 631aec96875..399b4dd0408 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{2015/06/19}
+\def\@anim@version{2015/07/18}
\ProvidesPackage{animate}
[\@anim@version\space PDF animations from files and inline graphics]
@@ -1748,7 +1748,7 @@
\global\advance\@anim@tmpcnt by -\@ne%
\xdef\@anim@maxframe{\the\@anim@tmpcnt}% highest frame index
%build timeline from optional timeline file
- \@anim@sanitize%
+ \@anim@sanitizeJS%
\if@anim@timeline\@anim@buildtmln{\the\@anim@num}\fi%
%insert animation widget & controls
\@anim@insertwidgets{\the\@anim@num}{%
@@ -1758,9 +1758,9 @@
\endgroup%
\global\advance\@anim@num by \@ne%
}%
-%adjust catcodes of several characters within \animategraphics
+%adjust catcode of `:' character within \animategraphics
\let\@anim@animategraphics\animategraphics
-\def\animategraphics{\@anim@sanitize\@anim@animategraphics}
+\def\animategraphics{\@anim@sanitizeColon\@anim@animategraphics}
%inserts animation and control button widgets
\def\@anim@insertwidgets#1#2{%#1:@anim@num, #2 existing btn colour combination
@@ -2075,7 +2075,7 @@
\global\advance\@anim@tmpcnt by -\@ne%
\xdef\@anim@maxframe{\the\@anim@tmpcnt}% highest frame index
%build timeline from optional timeline file
- \@anim@sanitize%
+ \@anim@sanitizeJS%
\if@anim@timeline\@anim@buildtmln{\the\@anim@num}\fi%
%insert animation widget & controls
\@anim@insertwidgets{\the\@anim@num}{%
@@ -2087,7 +2087,7 @@
\setboolean{@anim@inside}{false}%
}
\let\@anim@animateinline\animateinline
-\def\animateinline{\@anim@sanitize\@anim@animateinline}
+\def\animateinline{\@anim@sanitizeColon\@anim@animateinline}
%usercommand for use within `animateinline' environment;
%terminates the current frame and starts a new one
@@ -2173,12 +2173,12 @@
%starts new frame
\def\@anim@beginframe{%
\begin{lrbox}{\@anim@box}% store graphics in a box
- \the\@anim@begin%
+ \@anim@begin%
}
%terminates current frame
\def\@anim@endframe#1#2{%
- \the\@anim@end%
+ \@anim@end%
\end{lrbox}%
\ifnum\@anim@skipfram=\z@%
\ifnum#2=\z@%
@@ -2385,21 +2385,25 @@
}
\endgroup
-%macros for sanitizing characters read from timeline file
-\def\@anim@@sanitize#1#2\@nil{%
+%macros for sanitizing characters
+\def\@anim@sanitize#1#2\@nil{%
\catcode`#1=12%
\ifx\@empty#2\@empty\else%
- \@anim@@sanitize#2\@nil%
+ \@anim@sanitize#2\@nil%
\fi%
}
-\def\@anim@sanitize{%
+\def\@anim@sanitizeJS{% sanitize JS code while being read from timeline file
\begingroup%
- \@anim@@sanitize.:;?!/"'*+,->=<$\&@][)(^_`|~\#\@nil%
+ \@anim@sanitize.:;?!/"'*+,->=<$\&@][)(^_`|~\#\@nil%
\def\\{\string\\}%
\def\{{\string\{}%
\def\}{\string\}}%
\def\%{\string\%}%
}
+\def\@anim@sanitizeColon{% sanitize colon (`:') while reading the option list,
+ \begingroup% in particular the `buttonfg' and `buttonbg' options
+ \@anim@sanitize:\@nil% arguments
+}
\let\@anim@endsanitize\endgroup
%building timeline from timeline file
@@ -2932,13 +2936,11 @@
}%
}%
}
-\newtoks\@anim@begin
\define@key{anim@user}{begin}{%
- \@anim@begin{#1}%
+ \gdef\@anim@begin{#1}%
}
-\newtoks\@anim@end
\define@key{anim@user}{end}{%
- \@anim@end{#1}%
+ \gdef\@anim@end{#1}%
}
\define@key{anim@user}{every}{% embed every #1th frame
\ifnum#1<\@ne\gdef\@anim@every{1}\else\gdef\@anim@every{#1}\fi%
@@ -3024,8 +3026,8 @@
\gdef\@anim@usrjsat{}%
\gdef\@anim@tmlnfile{}%
\setboolean{@anim@timeline}{false}%
- \global\@anim@begin={}%
- \global\@anim@end={}%
+ \gdef\@anim@begin{}%
+ \gdef\@anim@end{}%
\gdef\@anim@every{1}% frames to be included
\gdef\@anim@gropts{}%
\setboolean{@anim@multipage}{false}%
@@ -3477,6 +3479,7 @@
\fi%
\fi%
\fi
+ return;%
}%
\if@anim@step\else%
\if@anim@pauseframes
@@ -3510,7 +3513,8 @@
a#1.stopFirst();%
\fi%
\fi%
- \fi%
+ \fi
+ return;%
}%
\if@anim@step\else%
\if@anim@pauseframes