From 87db3bff624ea61d6317321a423aa3093fa320b8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Aug 2006 23:35:58 +0000 Subject: movei15 update (16aug06) git-svn-id: svn://tug.org/texlive/trunk@1980 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/movie15/movie15.sty | 39 ++++++++++++++++++------- 1 file changed, 28 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/latex/movie15') diff --git a/Master/texmf-dist/tex/latex/movie15/movie15.sty b/Master/texmf-dist/tex/latex/movie15/movie15.sty index 694aa7a09fd..44702431632 100644 --- a/Master/texmf-dist/tex/latex/movie15/movie15.sty +++ b/Master/texmf-dist/tex/latex/movie15/movie15.sty @@ -9,7 +9,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{movie15}[2006/07/27] +\ProvidesPackage{movie15}[2006/08/15] \RequirePackage{keyval} \RequirePackage{ifthen} \RequirePackage{ifpdf} @@ -378,9 +378,11 @@ \@MXV@viewx\space\@MXV@viewy\space\@MXV@viewz}% \fi% %translation vector - \FPupn\@MXV@transx{#1 #7 abs \@MXV@viewx{} mul sub}% - \FPupn\@MXV@transy{#2 #7 abs \@MXV@viewy{} mul sub}% - \FPupn\@MXV@transz{#3 #7 abs \@MXV@viewz{} mul sub}% + \FPupn\@MXV@roo{#7 abs}% + \FPiflt\@MXV@roo{0.001}\FPupn\@MXV@roo{0.001}\fi% + \FPupn\@MXV@transx{#1 \@MXV@roo{} \@MXV@viewx{} mul sub}% + \FPupn\@MXV@transy{#2 \@MXV@roo{} \@MXV@viewy{} mul sub}% + \FPupn\@MXV@transz{#3 \@MXV@roo{} \@MXV@viewz{} mul sub}% %transformation matrix \xdef\@MXV@matrix{% \@MXV@matrix\space\@MXV@transx\space\@MXV@transy\space\@MXV@transz% @@ -390,10 +392,26 @@ %macro for parsing one line of 3D views file \newcommand{\@MXV@parseline}[5][]{% \xdef\@MXV@xname{#1}% name of the view (optional) - \xdef\@MXV@coo{#2}% - \xdef\@MXV@ctoc{#3}% - \xdef\@MXV@roo{#4}% - \xdef\@MXV@aac{#5}% + \ifthenelse{\equal{#2}{}}{% + \xdef\@MXV@coo{0 0 0}% + }{% + \xdef\@MXV@coo{#2}% + }% + \ifthenelse{\equal{#3}{}}{% + \xdef\@MXV@ctoc{0 -1 0}% + }{% + \xdef\@MXV@ctoc{#3}% + }% + \ifthenelse{\equal{#4}{}}{% + \xdef\@MXV@roo{0}% + }{% + \xdef\@MXV@roo{#4}% + }% + \ifthenelse{\equal{#5}{}}{% + \xdef\@MXV@aac{30}% + }{% + \xdef\@MXV@aac{#5}% + }% } %macro for generating an array of 3D views (varray) @@ -412,7 +430,6 @@ \IfFileExists{\@MXV@viewsfile}{% \edef\@MXV@endlinechar{\the\endlinechar}% \endlinechar=-1% suppress trailing space at input line end - \edef\@MXV@coo{}\edef\@MXV@ctoc{}\edef\@MXV@roo{}% \newread\@MXV@@viewsfile% \openin\@MXV@@viewsfile=\@MXV@viewsfile% \loop% @@ -2137,7 +2154,7 @@ )[\@MXV@getlabelvalue{@MXV@\@MXV@@label.3Doncurpage}-1]; annot3D["\@MXV@label"].activated=true; }catch(e){% - spc=String.fromCharCode(32); + var spc=String.fromCharCode(32); app.alert("3D" + spc + "annotation" + spc + "could" + spc + "not" + spc + "be" + spc + "activated!"); }% @@ -2271,7 +2288,7 @@ % %assemble result string var res = ''; - spc=String.fromCharCode(32); + var spc=String.fromCharCode(32); if(aac != 30){% res += util.printf('3Daac=\%s,' + spc, % (Math.abs(aac) < 1.001e-6 && Math.abs(aac) > 0 ? % -- cgit v1.2.3