media9 (9sep12)

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

3 files changed, 47 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 182d3185ebc..e0b3c3f92c4 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,8 +1,15 @@
+2012-09-07
+	* v0.12
+	* new: command option `3Dpsob' and 3d views file entry `PSOB' added on
+	request	of J. Bowman (Asymptote)
+	* fix: empty option list of \includemedia led to crash, improved Asymptote
+	compatibility
+
 2012-08-14
 	* v0.11
 	* new: package option `bigfiles' added which defers file embedding to the
 	ps->pdf step; needed when latex aborts with error `TeX capacity exceeded'
-	+ fix: minor fixes in 3Dmenu.js and media9.sty
+	* fix: minor fixes in 3Dmenu.js and media9.sty
 
 2012-07-31
 	* v0.9, v.10
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index ac72412c640..9005f612716 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
diff --git a/Master/texmf-dist/doc/latex/media9/media9.tex b/Master/texmf-dist/doc/latex/media9/media9.tex
index 4fefb902b9a..6c4e0fa6585 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -99,7 +99,7 @@ The final PDF can be viewed in current Adobe Readers on MS Windows and other pla
 
 \section{Requirements}
 \begin{trivlist}
-\makeatletter	
+\makeatletter    
 \item l3kernel (\LaTeX{} package), version $\ge \g@mix@liiikerneldate$
 \item l3packages (\LaTeX{} package), version $\ge \g@mix@liiipkgdate$
 \makeatother
@@ -272,6 +272,10 @@ Prescribes an initial camera roll around the optical axis (in clockwise directio
 \end{verbatim}
 This option directly sets the camera-to-world transformation matrix according to the PDF specification. This is an expert option to be used \emph{instead} of the `\verb+3Dc2c+', `\verb+3Dcoo+' and `\verb+3Droll+' options. Only fixed point real numbers are accepted.
 \begin{verbatim}
+3Dpsob=Min | Max | W | H
+\end{verbatim}
+Expert option which directly sets either the \verb+/PS+ entry in case of perspective projection or the \verb+/OB+ entry in case of orthographic projection to one of the four possible values. Default value is \verb+Min+.
+\begin{verbatim}
 3Droo=<r>
 \end{verbatim}
 \verb+<r>+ is a positive fixed or floating point number specifying the radius of orbit $ROO$ of the virtual camera. Good values can be found by means of the `\verb+3Dmenu+' option.
@@ -398,19 +402,20 @@ Things like animation, lighting, background of 3D objects etc. may also be scrip
   \caption{Entries in a {\tt VIEW} section.}\label{tab:views}
   \begin{tabular}[t]{p{0.24\linewidth}lp{0.4\linewidth}}\hline
   key & type & remarks\\\hline\hline
-  COO & three numbers & centre of orbit, see option `{\tt 3Dcoo}'\\
-  C2C & three numbers & centre of orbit to camera vector, see option `{\tt 3Dc2c}'\\
-  ROO & number & radius of orbit, see option `{\tt 3Droo}'\\
-  C2W & 12 numbers & camera-to-world transformation matrix, see option `{\tt 3Dc2w}'\\
-  AAC & number & camera aperture angle, see option `{\tt 3Daac}'\\
-  ORTHO & number (optional) & enables orthographic view, see option `{\tt 3Dortho}'\\
-  ROLL & number & camera roll, see option `{\tt 3Droll}'\\
-  BGCOLOR & three numbers & 3D scene background colour (RGB), see option `{\tt 3Dbg}'\\
-  RENDERMODE & string & render mode of the 3D object, see option `{\tt 3Drender}'\\
-  LIGHTS & string & lighting scheme, see option `{\tt 3Dlights}'\\
-  PARTSATTRS & string & allowed values are `{\tt keep}' and `{\tt restore}'; decides on whether to restore or not original part attributes before applying new ones from this view; see option `{\tt 3Dpartsattrs}'\\
-  PART\,\,(sub-sec\-tion) & string & part name as in the model tree; optional if a UTF16NAME entry is present in the sub-section opened by a PART keyword, otherwise required; see Table~\ref{tab:parts} for list of possible entries\\
-  CROSSSECT~(sub-section) & -- & see Table~\ref{tab:crosss} for list of possible entries\\
+  {\tt COO} & three numbers & centre of orbit, see option `{\tt 3Dcoo}'\\
+  {\tt C2C} & three numbers & centre of orbit to camera vector, see option `{\tt 3Dc2c}'\\
+  {\tt ROO} & number & radius of orbit, see option `{\tt 3Droo}'\\
+  {\tt C2W} & 12 numbers & camera-to-world transformation matrix, see option `{\tt 3Dc2w}'\\
+  {\tt AAC} & number & camera aperture angle, see option `{\tt 3Daac}'\\
+  {\tt ORTHO} & number (optional) & enables orthographic view, see option `{\tt 3Dortho}'\\
+  {\tt PSOB} & string & expert setting, see option `{\tt 3Dpsob}'\\
+  {\tt ROLL} & number & camera roll, see option `{\tt 3Droll}'\\
+  {\tt BGCOLOR} & three numbers & 3D scene background colour (RGB), see option `{\tt 3Dbg}'\\
+  {\tt RENDERMODE} & string & render mode of the 3D object, see option `{\tt 3Drender}'\\
+  {\tt LIGHTS} & string & lighting scheme, see option `{\tt 3Dlights}'\\
+  {\tt PARTSATTRS} & string & allowed values are `{\tt keep}' and `{\tt restore}'; decides on whether to restore or not original part attributes before applying new ones from this view; see option `{\tt 3Dpartsattrs}'\\
+  {\tt PART}\,\,(sub-sec\-tion) & string & part name as in the model tree; optional if a {\tt UTF16NAME} entry is present in the sub-section opened by a {\tt PART} keyword, otherwise required; see Table~\ref{tab:parts} for list of possible entries\\
+  {\tt CROSSSECT}~(sub-section) & -- & see Table~\ref{tab:crosss} for list of possible entries\\
   \hline
   \end{tabular}
 \end{table}
@@ -420,11 +425,11 @@ Things like animation, lighting, background of 3D objects etc. may also be scrip
   \caption{Entries in a {\tt PART} sub-section.}\label{tab:parts}
   \begin{tabular}[t]{llp{0.5\linewidth}}\hline
   key & type & remarks\\\hline\hline
-  UTF16NAME & hex string & part name in UTF-16 (aka Unicode), encoded as a hexadecimal string; optional, but useful for part names composed of non-latin characters;\\
-  VISIBLE & boolean & a flag (`{\tt true}' or `{\tt false}') indicating the visibility of this part\\
-  OPACITY & number & a number between 0.0 and 1.0 specifying the opacity of this part\\
-  RENDERMODE & string & rendermode of this part, overrides global {\tt RENDERMODE} value in parent {\tt VIEW} section, see option `{\tt 3Drender}'\\
-  TRANSFORM & 12 numbers & transformation matrix defining the part's position and scaling\\
+  {\tt UTF16NAME} & hex string & part name in UTF-16 (aka Unicode), encoded as a hexadecimal string; optional, but useful for part names composed of non-latin characters;\\
+  {\tt VISIBLE} & boolean & a flag (`{\tt true}' or `{\tt false}') indicating the visibility of this part\\
+  {\tt OPACITY} & number & a number between 0.0 and 1.0 specifying the opacity of this part\\
+  {\tt RENDERMODE} & string & rendermode of this part, overrides global {\tt RENDERMODE} value in parent {\tt VIEW} section, see option `{\tt 3Drender}'\\
+  {\tt TRANSFORM} & 12 numbers & transformation matrix defining the part's position and scaling\\
   \hline
   \end{tabular}
 \end{table}
@@ -434,8 +439,8 @@ Things like animation, lighting, background of 3D objects etc. may also be scrip
   \caption{Entries in a {\tt CROSSSECT} sub-section.}\label{tab:crosss}
   \begin{tabular}[t]{llp{0.5\linewidth}}\hline
   key & type & remarks\\\hline\hline
-  CENTER & three numbers & central point coordinates of the section plane\\
-  NORMAL & three numbers & normal vector coordinates of the section plane pointing into the cut-off region\\
+  {\tt CENTER} & three numbers & central point coordinates of the section plane\\
+  {\tt NORMAL} & three numbers & normal vector coordinates of the section plane pointing into the cut-off region\\
   \hline
   \end{tabular}
 \end{table}
@@ -547,15 +552,15 @@ parameter & description\\\hline\hline
 \centering
 \begin{Verbatim}
 \includemedia[
-  label=some_dice,          % defines JavaScript object annotRM['some_dice']
+  label=some_dice,        % defines JavaScript object annotRM['some_dice']
   width=0.4\linewidth,height=0.3\linewidth,
   activate=pageopen,
-  addresource=files/random.mp4,           %two video files
-  addresource=files/cube.mp4,
+  addresource=random.mp4, %two video files
+  addresource=cube.mp4,
   flashvars={
-    source=files/random.mp4 % same path as in addresource!
-   &loop=true               % loop video
-   &scaleMode=letterbox     % preserve aspect ratio while scaling the video
+    source=random.mp4
+   &loop=true             % loop video
+   &scaleMode=letterbox   % preserve aspect ratio while scaling the video
   }
 ]{}{VPlayer.swf}
 
@@ -568,13 +573,13 @@ parameter & description\\\hline\hline
 \PushButton[
   onclick={
     annotRM['some_dice'].activated=true;
-    annotRM['some_dice'].callAS('setSource', 'files/random.mp4');
+    annotRM['some_dice'].callAS('setSource', 'random.mp4');
   }
 ]{\fbox{random.mp4}}
 \PushButton[
   onclick={
     annotRM['some_dice'].activated=true;
-    annotRM['some_dice'].callAS('setSource', 'files/cube.mp4');
+    annotRM['some_dice'].callAS('setSource', 'cube.mp4');
   }
 ]{\fbox{cube.mp4}}
 \end{Verbatim}
@@ -583,18 +588,18 @@ parameter & description\\\hline\hline
   label=some_dice,
   width=0.6\linewidth,height=0.45\linewidth,
   activate=pageopen,
-  addresource=files/random.mp4,
-  addresource=files/cube.mp4,
+  addresource=random.mp4,
+  addresource=cube.mp4,
   flashvars={
-    source=files/random.mp4
+    source=random.mp4
    &loop=true
    &scaleMode=letterbox
   }
 ]{}{VPlayer.swf}\hfill}
 \makebox[\linewidth]{\hfill%
   \PushButton[onclick={annotRM['some_dice'].activated=true;annotRM['some_dice'].callAS('playPause');}]{\fbox{\strut Play/Pause}}
-  \PushButton[onclick={annotRM['some_dice'].activated=true;annotRM['some_dice'].callAS('setSource', 'files/random.mp4');}]{\fbox{\strut random.mp4}}
-  \PushButton[onclick={annotRM['some_dice'].activated=true;annotRM['some_dice'].callAS('setSource', 'files/cube.mp4');}]{\fbox{\strut cube.mp4}}
+  \PushButton[onclick={annotRM['some_dice'].activated=true;annotRM['some_dice'].callAS('setSource', 'random.mp4');}]{\fbox{\strut random.mp4}}
+  \PushButton[onclick={annotRM['some_dice'].activated=true;annotRM['some_dice'].callAS('setSource', 'cube.mp4');}]{\fbox{\strut cube.mp4}}
 \hfill}
 \caption{Example of playing back two different embedded MP4 video files in the same video player instance. The player, `VPlayer.swf', is also embedded in the PDF. Exposed ActionScript functions `{\tt playPause}' and `{\tt setSource}' of `VPlayer.swf' (Table~\ref{AVPlayerMethods}) are used to set-up the JavaScript actions of interactive push buttons.}\label{videoa}
 \end{figure}