movei15 update (jul09)

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

1 files changed, 45 insertions, 35 deletions

diff --git a/Master/texmf-dist/tex/latex/movie15/movie15.sty b/Master/texmf-dist/tex/latex/movie15/movie15.sty
index c8a5bca1edd..ab0b4b538a5 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}[2009/05/15]
+\ProvidesPackage{movie15}[2009/07/07]
 \RequirePackage{keyval}
 \RequirePackage{ifthen}
 \RequirePackage{ifpdf}
@@ -84,7 +84,7 @@
 
 \AtBeginDocument{%
   \@ifpackageloaded{hyperref}{}{\@MXV@missing{hyperref}}%
-  \hypersetup{unicode}
+%  \hypersetup{unicode}
   \ifHy@colorlinks% coloured (movieref-)link text instead of link border
     \gdef\@MXV@pdfborder{/Border [0 0 0]}%
   \else%
@@ -2903,48 +2903,55 @@
                   charht+=2;%
                   switch(scene.renderMode){%
                     case scene.RENDER_MODE_BOUNDING_BOX:
-                      currender='BoundingBox';break;
+                      defaultrender='BoundingBox';break;
                     case scene.RENDER_MODE_TRANSPARENT_BOUNDING_BOX:
-                      currender='TransparentBoundingBox';break;
+                      defaultrender='TransparentBoundingBox';break;
                     case scene.RENDER_MODE_TRANSPARENT_BOUNDING_BOX_OUTLINE:
-                      currender='TransparentBoundingBoxOutline';break;
+                      defaultrender='TransparentBoundingBoxOutline';break;
                     case scene.RENDER_MODE_VERTICES:
-                      currender='Vertices';break;
+                      defaultrender='Vertices';break;
                     case scene.RENDER_MODE_SHADED_VERTICES:
-                      currender='ShadedVertices';break;
+                      defaultrender='ShadedVertices';break;
                     case scene.RENDER_MODE_WIREFRAME:
-                      currender='Wireframe';break;
+                      defaultrender='Wireframe';break;
                     case scene.RENDER_MODE_SHADED_WIREFRAME:
-                      currender='ShadedWireframe';break;
+                      defaultrender='ShadedWireframe';break;
                     case scene.RENDER_MODE_SOLID:
-                      currender='Solid';break;
+                      defaultrender='Solid';break;
                     case scene.RENDER_MODE_TRANSPARENT:
-                      currender='Transparent';break;
+                      defaultrender='Transparent';break;
                     case scene.RENDER_MODE_SOLID_WIREFRAME:
-                      currender='SolidWireframe';break;
+                      defaultrender='SolidWireframe';break;
                     case scene.RENDER_MODE_TRANSPARENT_WIREFRAME:
-                      currender='TransparentWireframe';break;
+                      defaultrender='TransparentWireframe';break;
                     case scene.RENDER_MODE_ILLUSTRATION:
-                      currender='Illustration';break;
+                      defaultrender='Illustration';break;
                     case scene.RENDER_MODE_SOLID_OUTLINE:
-                      currender='SolidOutline';break;
+                      defaultrender='SolidOutline';break;
                     case scene.RENDER_MODE_SHADED_ILLUSTRATION:
-                      currender='ShadedIllustration';break;
+                      defaultrender='ShadedIllustration';break;
                     case scene.RENDER_MODE_HIDDEN_WIREFRAME:
-                      currender='HiddenWireframe';break;
-                    case scene.RENDER_MODE_DEFAULT:
-                      currender='Default';break;
+                      defaultrender='HiddenWireframe';break;
                   }%
-                  res+=spc+spc+'RENDERMODE='+currender+nl;%
+                  res+=spc+spc+'RENDERMODE='+defaultrender+nl;%
                   charht+=2;%
                   for(var i=0;i<scene.meshes.count;i++){%
                     var mesh=scene.meshes.getByIndex(i);%
-                    res+=spc+spc+'PART={'+mesh.name+'}'+nl;%
-                    res+=spc+spc+spc+spc+'VISIBLE='+mesh.visible+nl;%
-                    charht+=4;%
+                    respart=spc+spc+'PART={'+mesh.name+'}'+nl;%
+					charhtpart=2;
+					defaultvals=true;%
+					if(!mesh.visible){%
+                      respart+=spc+spc+spc+spc+'VISIBLE=false'+nl;%
+                      charhtpart+=2;%
+					  defaultvals=false;%
+					}  
                     if(mesh.visible){%
-                      res+=spc+spc+spc+spc+'OPACITY='+mesh.opacity+nl;%
-                      charht+=2;%
+					  if(mesh.opacity<1.0){%
+                        respart+=spc+spc+spc+spc+'OPACITY='+mesh.opacity+nl;%
+                        charhtpart+=2;%
+					    defaultvals=false;%
+					  }%
+                      currender=defaultrender;%
                       switch(mesh.renderMode){%
                         case scene.RENDER_MODE_BOUNDING_BOX:
                           currender='BoundingBox';break;
@@ -2976,16 +2983,21 @@
                           currender='ShadedIllustration';break;
                         case scene.RENDER_MODE_HIDDEN_WIREFRAME:
                           currender='HiddenWireframe';break;
-                        case scene.RENDER_MODE_DEFAULT:
-                          currender='Default';break;
+%                        case scene.RENDER_MODE_DEFAULT:
+%                          currender='Default';break;
                       }%
-                      if(currender!='Default'){%
-                        res+=spc+spc+spc+spc+'RENDERMODE='+currender+nl;%
-                        charht+=2;%
+                      if(currender!=defaultrender){%
+                        respart+=spc+spc+spc+spc+'RENDERMODE='+currender+nl;%
+                        charhtpart+=2;%
+						defaultvals=false;%
                       }%
                     }%
-                    res+=spc+spc+'END'+nl;%
-                    charht+=2;%
+                    respart+=spc+spc+'END'+nl;%
+                    charhtpart+=2;%
+					if(!defaultvals){%
+					  res+=respart;
+					  charht+=charhtpart;
+					}%
                   }%
                   res+='END'+nl;%
                   charht=(charht>40?40:charht);%
@@ -3363,7 +3375,7 @@
                   }%
                   %determine background colour
                   rgb=scene.background.getColor();%
-                  if(!(rgb.r==1.0&&rgb.g==1.0&&rgb.b==1.0)){%
+                  if(rgb.r!=1.0||rgb.g!=1.0||rgb.b!=1.0){%
                     charht+=2;multiln=true;
                     res+=util.printf(nl+'3Dbg=\%f' + spc + '\%f' + spc + '\%f,',%
                     rgb.r, rgb.g, rgb.b);%
@@ -3431,8 +3443,6 @@
                       currender='ShadedIllustration';break;
                     case scene.RENDER_MODE_HIDDEN_WIREFRAME:
                       currender='HiddenWireframe';break;
-                    case scene.RENDER_MODE_DEFAULT:
-                      currender='Default';break;
                   }%
                   if(currender!='Solid'){%
                     charht+=2;multiln=true;