update movie15 from ctan

git-svn-id: svn://tug.org/texlive/trunk@6276 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 32 insertions, 1 deletions

diff --git a/Master/texmf-dist/doc/latex/movie15/README b/Master/texmf-dist/doc/latex/movie15/README
index 01549f87ef2..6b0d7717db9 100644
--- a/Master/texmf-dist/doc/latex/movie15/README
+++ b/Master/texmf-dist/doc/latex/movie15/README
@@ -243,6 +243,15 @@ Usage:
                               `Primary', `Blue', `Red', `Cube', `CAD',
                               `HeadLamp'.
 
+   3Drender=<render mode>     Sets the default render mode. Possible values
+                              are: `Solid', `SolidWireframe', `Transparent',
+                              `TransparentWireframe', `BoundingBox',
+                              `TransparentBoundingBox',
+                              `TransparentBoundingBoxOutline', `Wireframe',
+                              `ShadedWireframe', `HiddenWireframe', `Vertices',
+                              `ShadedVertices', `Illustration', `SolidOutline',
+                              `ShadedIllustration'.
+
    3Djscript=<JavaScript file> Things like animation, lighting, background
                               colour etc. may also be script driven. Option
                               `3Djscript' associates a <JavaScript file> with
diff --git a/Master/texmf-dist/doc/latex/movie15/movie15.pdf b/Master/texmf-dist/doc/latex/movie15/movie15.pdf
index 4c8fe4e11ef..5ad2b84a4a1 100644
--- a/Master/texmf-dist/doc/latex/movie15/movie15.pdf
+++ b/Master/texmf-dist/doc/latex/movie15/movie15.pdf
diff --git a/Master/texmf-dist/doc/latex/movie15/movie15.tex b/Master/texmf-dist/doc/latex/movie15/movie15.tex
index 44a033b4a00..8f18cc27993 100644
--- a/Master/texmf-dist/doc/latex/movie15/movie15.tex
+++ b/Master/texmf-dist/doc/latex/movie15/movie15.tex
@@ -310,6 +310,12 @@ This option sets the background colour of the canvas. Only fixed point real numb
 \end{verbatim}
 Sets the default lighting scheme. The following values are honoured: `\verb+None+', `\verb+White+', `\verb+Day+', `\verb+Night+', `\verb+Hard+', `\verb+Primary+', `\verb+Blue+', `\verb+Red+', `\verb+Cube+', `\verb+CAD+', `\verb+HeadLamp+'. The default is to use the lighting scheme as specified within the 3D artwork.
 \begin{verbatim}
+3Drender=<render mode>
+\end{verbatim}
+\begin{flushleft}
+Sets the default render mode. The following values are honoured: `\verb+Solid+', `\verb+SolidWireframe+', `\verb+Transparent+', `\verb+TransparentWireframe+', `\verb+BoundingBox+', `\verb+TransparentBoundingBox+', `\verb+TransparentBoundingBoxOutline+', `\verb+Wireframe+', `\verb+ShadedWireframe+', `\verb+HiddenWireframe+', `\verb+Vertices+', `\verb+ShadedVertices+', `\verb+SolidOutline+', `\verb+Illustration+', `\verb+ShadedIllustration+'.
+\end{flushleft}
+\begin{verbatim}
 3Djscript=<JavaScript file>
 \end{verbatim}
 Things like animation, lighting, background etc. may also be script driven. Option `\verb+3Djscript+' associates \verb+<JavaScript file>+ with the 3D object. The script will be executed upon activation of the object. Refer to the Acrobat 3D JavaScript Reference~\cite{jscript3D} for details. Directory `\verb+doc/javascript+' contains JavaScript example files for animation and rotation control. The files work off-the-shelf with any 3D file and may be concatenated to combine their effects.
diff --git a/Master/texmf-dist/tex/latex/movie15/movie15.sty b/Master/texmf-dist/tex/latex/movie15/movie15.sty
index 9d6e14aba3d..ec33ab948b1 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}[2008/01/10]
+\ProvidesPackage{movie15}[2008/01/16]
 \RequirePackage{keyval}
 \RequirePackage{ifthen}
 \RequirePackage{ifpdf}
@@ -280,6 +280,7 @@
     \gdef\@MXV@iiidrate{}% animation speed
     \global\@MXV@iiidrepeat=-1% repeat count
     \gdef\@MXV@lights{}% default lighting scheme
+    \gdef\@MXV@render{}% default render mode scheme
   }{}%
 }%
 
@@ -616,6 +617,7 @@
         /XN(\@MXV@xname)% name of the view appearing in the drop down list
         \@MXV@background%
         \@MXV@lights%
+        \@MXV@render%
       >>}\pdfrefobj\pdflastobj%
       \xdef\@MXV@@viewobj{\the\pdflastobj\space 0 R}%
     }%
@@ -871,6 +873,7 @@
             /XN(\@MXV@xname)%
             \@MXV@background%
             \@MXV@lights%
+            \@MXV@render%
           >>%
         }%
       }%
@@ -2007,6 +2010,8 @@
           \@MXV@newlabel{@MXV@\@MXV@label.3D}{true}%
           \@MXV@labeltoaux{@MXV@\@MXV@label.3Dlights}{\@MXV@lights}%
           \@MXV@newlabel{@MXV@\@MXV@label.3Dlights}{\@MXV@lights}%
+          \@MXV@labeltoaux{@MXV@\@MXV@label.3Drender}{\@MXV@render}%
+          \@MXV@newlabel{@MXV@\@MXV@label.3Drender}{\@MXV@render}%
         \fi%
         \ifx\@MXV@@label\@empty\else%
           \@MXV@labeltoaux{@MXV@\@MXV@@label.3Doncurpage}{\the\@MXV@iiidoncurpage}%
@@ -2384,6 +2389,12 @@
           }{%
             \edef\@MXV@lights{\@MXV@getlabelvalue{@MXV@\@MXV@label.3Dlights}}%
           }%
+          %retrieve default render mode
+          \ifthenelse{\equal{\@MXV@getlabelvalue{@MXV@\@MXV@label.3Drender}}{undefined}}{%
+            \edef\@MXV@render{}%
+          }{%
+            \edef\@MXV@render{\@MXV@getlabelvalue{@MXV@\@MXV@label.3Drender}}%
+          }%
           \setkeys{MXV@user}{#1}%
           \if@MXV@defaultviewprovided% define a new view,
             %using any of the coo, c2c, roo, caa options
@@ -3522,6 +3533,11 @@
     \gdef\@MXV@lights{/LS <</Subtype/#1>>}%
   }{\@MXV@neediiiD}%
 }
+\define@key{MXV@user}{3Drender}{%
+  \ifthenelse{\boolean{@MXV@iiiDfeat}}{%
+    \gdef\@MXV@render{/RM <</Subtype/#1>>}%
+  }{\@MXV@neediiiD}%
+}
 %options for \movieref command
 \define@key{MXV@user}{play}[true]{%
   \setboolean{@MXV@linkplay}{#1}%