diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/animate/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/animate/doc/animate.pdf | bin | 1312253 -> 1315467 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/animate/doc/animate.tex | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/animate/doc/files/exp.mp | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/animate/doc/files/scarab.mp | 14 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/animate/animate.sty | 80 |
6 files changed, 29 insertions, 73 deletions
diff --git a/Master/texmf-dist/doc/latex/animate/README b/Master/texmf-dist/doc/latex/animate/README index 22363a9b714..0c7ccb12224 100644 --- a/Master/texmf-dist/doc/latex/animate/README +++ b/Master/texmf-dist/doc/latex/animate/README @@ -74,7 +74,7 @@ Usage: end={<end text>}, timeline=<timeline file>, every=<number>, bb=<llx> <lly> <urx> <ury>, viewport=<llx> <lly> <urx> <ury>, - trim=<crop left> <crop bottom> <crop right> <crop top> + trim=<left> <bottom> <right> <top> Requirements: diff --git a/Master/texmf-dist/doc/latex/animate/doc/animate.pdf b/Master/texmf-dist/doc/latex/animate/doc/animate.pdf Binary files differindex 491cef4f98f..6346bdeb512 100644 --- a/Master/texmf-dist/doc/latex/animate/doc/animate.pdf +++ b/Master/texmf-dist/doc/latex/animate/doc/animate.pdf diff --git a/Master/texmf-dist/doc/latex/animate/doc/animate.tex b/Master/texmf-dist/doc/latex/animate/doc/animate.tex index 968897d4d36..12167460243 100644 --- a/Master/texmf-dist/doc/latex/animate/doc/animate.tex +++ b/Master/texmf-dist/doc/latex/animate/doc/animate.tex @@ -73,7 +73,7 @@ The `animate' package makes use of Optional Content Groups (OCG), also known as \begin{trivlist} \item pdf\TeX{}, version $\ge1.20$ for direct PDF output \item Ghostscript, version $\ge8.31$ or Adobe Distiller for PS to PDF conversion -\item Adobe Reader, version $\ge6$, but not $8.0$ and $8.1$ +\item Adobe Reader, version $\ge6$, but not $8$ \end{trivlist} \section{Installation} diff --git a/Master/texmf-dist/doc/latex/animate/doc/files/exp.mp b/Master/texmf-dist/doc/latex/animate/doc/files/exp.mp index f0999f164dc..f719391fecf 100644 --- a/Master/texmf-dist/doc/latex/animate/doc/files/exp.mp +++ b/Master/texmf-dist/doc/latex/animate/doc/files/exp.mp @@ -1,5 +1,5 @@ -%@AUTHOR: Jan Holecek, Alexander Grahn -%@DATE: 2007/10/02 +% Jan Holecek, Alexander Grahn +% 2008/01/03 filenametemplate "%j_%c.mps"; diff --git a/Master/texmf-dist/doc/latex/animate/doc/files/scarab.mp b/Master/texmf-dist/doc/latex/animate/doc/files/scarab.mp index c12e563c30b..bef95226e24 100644 --- a/Master/texmf-dist/doc/latex/animate/doc/files/scarab.mp +++ b/Master/texmf-dist/doc/latex/animate/doc/files/scarab.mp @@ -1,10 +1,9 @@ -%@AUTHOR: Maxime Chupin, Alexander Grahn -%@DATE: 2007/11/26 +% Maxime Chupin, Alexander Grahn +% 2008/01/03 filenametemplate "%j_%c.mps"; verbatimtex -%&latex \documentclass{article} \usepackage[latin1]{inputenc} \usepackage{amsmath} @@ -12,7 +11,6 @@ verbatimtex etex u:=4cm; -picture trait; vardef proj(expr P,M,N)= save H; @@ -23,10 +21,10 @@ vardef proj(expr P,M,N)= enddef; path dr,cercle,drb,scara; -pair A,B,C,D,Q,T,O',P,O,M,N; +pair A,B,C,D,Q,T,O',P,O,M; O:=(0,0); O':=(-u/3,0); -A:=(u/sqrt(2),u/sqrt(2)) shifted O' ; +A:=(u/sqrt(2),u/sqrt(2)) shifted O'; B:=(u/sqrt(2),-u/sqrt(2)) shifted O'; C:=(-u/sqrt(2),-u/sqrt(2))shifted O'; D:=(-u/sqrt(2),u/sqrt(2)) shifted O'; @@ -39,7 +37,7 @@ for i:=0 upto 100: P:=A; Q:=O'; M:=proj(O,P,Q); - scara:=M; + scara:=M; else: scara:=M; for j:=1 upto 4: @@ -85,8 +83,6 @@ for i:=0 upto 100: (u,1.2u)--(u,-1.2u)--(-1.5u,-1.2u)--(-1.5u,1.2u)--cycle; draw 12[P,Q]--12[Q,P] dashed evenly; draw O--M dashed evenly; - pickup pencircle scaled 1pt; - draw scara withcolor red; pickup pencircle scaled 1.4pt; draw P--Q withcolor blue; label.rt(btex $2l$ etex, 0.5[P,Q]); diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty index c13b714aa30..d434237a8b3 100644 --- a/Master/texmf-dist/tex/latex/animate/animate.sty +++ b/Master/texmf-dist/tex/latex/animate/animate.sty @@ -13,7 +13,7 @@ % Supports LaTeX->dvips->ps2pdf or pdfLaTeX workflows. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{animate}[2007/11/30] +\ProvidesPackage{animate}[2008/01/03] \RequirePackage{keyval} \RequirePackage{ifthen} \RequirePackage{ifpdf} @@ -168,7 +168,8 @@ \fi% \else% \edef\@anim@curfile{*[page=#2\@anim@gropts]{#1}}% - \global\setbox\@anim@box=\hbox{\expandafter\includegraphics\@anim@curfile}% + \global\setbox\@anim@box=\hbox{% + \expandafter\includegraphics\@anim@curfile}% \fi% } \else @@ -222,31 +223,15 @@ }% \immediate\pdfxform\@anim@box% \xdef\@anim@lastxform{\the\pdflastxform}% - \if@anim@timeline% - %keep a record of XObject number - \@anim@newkey{img@#2}{\@anim@lastxform\space 0 R}% - \else% - \xdef\@anim@xobject{%XObject resource entry of container XObject - \@anim@xobject\space/im#2\space\@anim@lastxform\space 0 R% - }% - \fi% + %keep a record of XObject number + \@anim@newkey{img@#2}{\@anim@lastxform\space 0 R}% }{% - \if@anim@timeline% - \@anim@newkey{img@#2}{#4\space 0 R}% - \else% - \xdef\@anim@xobject{\@anim@xobject\space/im#2\space #4\space 0 R}% - \fi% + \@anim@newkey{img@#2}{#4\space 0 R}% }% \if@anim@timeline\else% - \@anim@newocg{#1}{#2}% - %Properties entry for use in container XObject - \xdef\@anim@properties{% - \@anim@properties\space/oc#2\space\@anim@curocg% - }% - %content stream of container XObject - \xdef\@anim@content{% - \@anim@content\space /OC/oc#2\space BDC q /im#2\space Do Q EMC% - }% + \@anim@newkey{frmxobject@#2}{/im#2\space\@anim@getkeyval{img@#2}}% + \@anim@newkey{frmcontent@#2}{ q /im#2\space Do Q}% + \@anim@makeframe{#1}{#2}% \fi% } \else @@ -312,32 +297,14 @@ grestore }% \xdef\@anim@lastxform{@anim@frm@#1@#2}% - \if@anim@timeline% - \@anim@newkey{img@#2}{{@anim@frm@#1@#2}}% - \else% - \xdef\@anim@xobject{% XObject resource entry of container XObject - \@anim@xobject\space/im#2\space {@anim@frm@#1@#2}% - }% - \fi% + \@anim@newkey{img@#2}{{@anim@frm@#1@#2}}% }{% - \if@anim@timeline% - \@anim@newkey{img@#2}{{#4}}% - \else% - \xdef\@anim@xobject{% XObject resource entry of container XObject - \@anim@xobject\space/im#2\space {#4}% - }% - \fi% + \@anim@newkey{img@#2}{{#4}}% }% \if@anim@timeline\else% - \@anim@newocg{#1}{#2}% - %Properties entry for use in container XObject - \xdef\@anim@properties{% - \@anim@properties\space/oc#2\space {@anim@ocg@#1@#2}% - }% - %content stream of container XObject - \xdef\@anim@content{% - \@anim@content\space /OC/oc#2\space BDC q /im#2\space Do Q EMC% - }% + \@anim@newkey{frmxobject@#2}{/im#2\space\@anim@getkeyval{img@#2}}% + \@anim@newkey{frmcontent@#2}{ q /im#2\space Do Q}% + \@anim@makeframe{#1}{#2}% \fi% } \fi @@ -389,10 +356,7 @@ \end{picture}% \pdfliteral{Q\@anim@content}% }% - \immediate\pdfxform resources {% - \if@anim@timeline\else/Properties <<\@anim@properties>>\fi - /XObject <<\@anim@xobject>> - }\@anim@box% + \immediate\pdfxform resources {/XObject <<\@anim@xobject>>}\@anim@box% \xdef\@anim@container{\the\pdflastxform\space 0 R}% } \else @@ -403,18 +367,14 @@ mark {@anim@xobj#1} << /Type/XObject/Subtype/Form/FormType 1 /BBox [frame@llx frame@lly frame@urx frame@ury] - /Resources << - \if@anim@timeline\else/Properties <<\@anim@properties>>\fi - /XObject <<\@anim@xobject>> - >> + /Resources <</XObject <<\@anim@xobject>>>> >> /PUT pdfmark }% } \fi -%intermediate container XObject, for use with the timeline option, which -%represents one animation frame and which contains all the transparencies -%that compose the frame +%intermediate container XObject, which represents one animation frame +%containing all the transparencies that compose the frame \ifpdf \def\@anim@makeframe#1#2{% #1:@anim@num, #2:@anim@curframe@zb \@anim@newocg{#1}{#2}% @@ -1877,8 +1837,8 @@ \define@key{anim@user}{buttonsize}{% \gdef\@anim@btnsize{#1}% } -\def\@anim@colours#1:#2\@nil{% helper macro to get number of colour components and - \xdef\@anim@colour{\@anim@colour\space #1}% to replace : by ` ' in the arg +\def\@anim@colours#1:#2\@nil{% helper macro to get number of colour components + \xdef\@anim@colour{\@anim@colour\space #1}% and to replace : by ` ' in the arg \ifthenelse{\equal{#2}{!}}{}{% \global\advance\@anim@tmpcnt by \@ne% \@anim@colours#2\@nil% |