summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-27 22:24:23 +0000
committerKarl Berry <karl@freefriends.org>2013-11-27 22:24:23 +0000
commit1189a0e1f133588fb81593c2d3a4e07819a6e158 (patch)
tree601df2d8216426130bf650375340365744943ddf /Master
parent7b3d34b5e8c3eec4a6303d1938982c0f1425152b (diff)
media9 (27nov13)
git-svn-id: svn://tug.org/texlive/trunk@32259 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/media9/ChangeLog5
-rw-r--r--Master/texmf-dist/doc/latex/media9/media9.pdfbin3304517 -> 3304467 bytes
-rw-r--r--Master/texmf-dist/doc/latex/media9/media9.tex10
-rw-r--r--Master/texmf-dist/tex/latex/media9/javascript/3Dmenu.js4
-rw-r--r--Master/texmf-dist/tex/latex/media9/media9.sty9
5 files changed, 17 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 53f900fc067..d0e83d2fa5a 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-27
+ * v0.37
+ * fix: error in case of control sequence used in the last argument of
+ \includemedia
+
2013-11-26
* v0.36
* fix: Postscript error with zero size media annotations
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 8fd8b61dfd5..c8f4f623faa 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/media9/media9.tex b/Master/texmf-dist/doc/latex/media9/media9.tex
index 186d50bb6c2..81507e3d460 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -273,7 +273,7 @@ Indicates whether a 3D toolbar should be shown in the Reader on top of the embed
\begin{verbatim}
3Dnavpane
\end{verbatim}
-If set, the 3D navigation pane displaying the 3D Model Tree becomes visible in the Reader when the content is initially activated.
+If set, the 3D navigation pane displaying the \Acrobatmenu{ShowHideModelTree}{3D Model Tree} becomes visible in the Reader when the content is initially activated.
\begin{verbatim}
3Dcoo=<x> <y> <z>
\end{verbatim}
@@ -310,7 +310,7 @@ Switches from the default perspective to orthographic view mode. In orthographic
\begin{verbatim}
3Dmenu
\end{verbatim}
-Mainly used during document authoring. Adds three entries, `\emph{\sffamily Generate Default View}', `\emph{\sffamily Get Current View}' and `\emph{\sffamily Cross Section}' to the context (right-click) menu of an activated 3D annotation. Moreover, it allows single parts or part groups of the scene to be scaled, translated and rotated against the remaining scene objects using the keyboard. Their new position can be saved in the current view (`\emph{\sffamily Get Current View}'). At first, parts to be modified must be highlighted by clicking either into the scene or into the model tree (the part's bounding box becomes visible). Then, arrow keys \keys{\arrowkeyleft}, \keys{\arrowkeyright} let the part spin around the vertical axis, and \keys{\arrowkeyup}, \keys{\arrowkeydown} tilt against it. In order to spin parts around their local up-axis, keep \keys{\ctrl} pressed while using \keys{\arrowkeyleft} and \keys{\arrowkeyright}. Keys \keys{X}, \keys{\shift+X}, \keys{Y}, \keys{\shift+Y}, \keys{Z}, \keys{\shift+Z} translate the selected part along the World axes, and \keys{S}, \keys{\shift+S} scale the part.
+Mainly used during document authoring. Adds three entries, `\emph{\sffamily Generate Default View}', `\emph{\sffamily Get Current View}' and `\emph{\sffamily Cross Section}' to the context (right-click) menu of an activated 3D annotation. Moreover, it allows single parts or part groups of the scene to be scaled, translated and rotated against the remaining scene objects using the keyboard. Their new position can be saved in the current view (`\emph{\sffamily Get Current View}'). At first, parts to be modified must be highlighted by clicking either into the scene or into the \Acrobatmenu{ShowHideModelTree}{3D Model Tree} (the part's bounding box becomes visible). Then, arrow keys \keys{\arrowkeyleft}, \keys{\arrowkeyright} let the part spin around the vertical axis, and \keys{\arrowkeyup}, \keys{\arrowkeydown} tilt against it. In order to spin parts around their local up-axis, keep \keys{\ctrl} pressed while using \keys{\arrowkeyleft} and \keys{\arrowkeyright}. Keys \keys{X}, \keys{\shift+X}, \keys{Y}, \keys{\shift+Y}, \keys{Z}, \keys{\shift+Z} translate the selected part along the World axes, and \keys{S}, \keys{\shift+S} scale the part.
`\emph{\sffamily Generate Default View}' computes optimal camera settings such that the visible parts of the 3D scene fit tightly into the viewing area. The result is printed, formatted as a list of \verb+\includemedia+ options, into the JavaScript console. The calculation is based on the 3D object size and its position in the World coordinate system as well as the current viewing mode (perspective or orthographic).
@@ -382,7 +382,7 @@ The file \verb+<views file>+ is structured into view sections, one for every vie
\end{verbatim}
A view section starts with the keyword \verb+VIEW+, optionally followed by a name for the view, and ends with the keyword \verb+END+. If no name is given to the view, a default one is created, consisting of `View' followed by the number of the current \verb+VIEW+ section in the file. A \verb+VIEW+ section may contain optional entries for setting the camera position and global rendering attributes of the scene, a \verb+CROSSSECT+ subsection as well as \verb+PART+ subsections for setting rendering and other attributes of parts individually. Table~\ref{tab:views} lists the entries in a \verb+VIEW+ section.
-Part sub-sections are opened by \verb+PART=<part name>+ and closed by \verb+END+. There may be as many part subsections as there are parts in a 3D scene. Table~\ref{tab:parts} lists the possible entries in a \verb+PART+ sub-section. All entries are optional. However, a \verb+UTF16NAME+ entry is recommended, as the part name may contain non-ASCII characters. The value of the \verb+UTF16NAME+ key is the part name as a hex-encoded Unicode string. If \verb+UTF16NAME+ is not used, the part name in the 3D file must be entirely composed of ASCII characters. In that case, \verb+<part name>+ is mandatory and must match the part name as indicated in the Model Tree of the 3D object (accessible via right-click onto the model in the Reader). The part can be scaled and repositioned by means of a \verb+TRANSFORM+ entry which takes a 12-element transformation matrix as its value. Remaining entries in a part sub-section control the visual appearance of the part.
+Part sub-sections are opened by \verb+PART=<part name>+ and closed by \verb+END+. There may be as many part subsections as there are parts in a 3D scene. Table~\ref{tab:parts} lists the possible entries in a \verb+PART+ sub-section. All entries are optional. However, a \verb+UTF16NAME+ entry is recommended, as the part name may contain non-ASCII characters. The value of the \verb+UTF16NAME+ key is the part name as a hex-encoded Unicode string. If \verb+UTF16NAME+ is not used, the part name in the 3D file must be entirely composed of ASCII characters. In that case, \verb+<part name>+ is mandatory and must match the part name as indicated in the \Acrobatmenu{ShowHideModelTree}{3D Model Tree} of the 3D object (accessible via right-click onto the model in the Reader). The part can be scaled and repositioned by means of a \verb+TRANSFORM+ entry which takes a 12-element transformation matrix as its value. Remaining entries in a part sub-section control the visual appearance of the part.
A view section may contain at most one \verb+CROSSSECT+ sub-section. It inserts a section plane at a definite position and orientation in the 3D space, controlled by optional \verb+CENTER+ and \verb+NORMAL+ entries. See Table~\ref{tab:crosss} for explanation.
@@ -422,7 +422,7 @@ Things like animation, lighting, background of 3D objects etc. may also be scrip
\begin{table}[bp]%[p]%[htbp]
\centering
\caption{Entries in a {\tt VIEW} section.}\label{tab:views}
- \begin{tabular}[t]{p{0.24\linewidth}lp{0.4\linewidth}}\hline
+ \begin{tabular}[t]{p{0.24\linewidth}lp{0.42\linewidth}}\hline
key & type & remarks\\\hline\hline
{\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}'\\
@@ -436,7 +436,7 @@ Things like animation, lighting, background of 3D objects etc. may also be scrip
{\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 PART}\,\,(sub-sec\-tion) & string & part name as in the \Acrobatmenu{ShowHideModelTree}{3D Model Tree}; name argument is 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}
diff --git a/Master/texmf-dist/tex/latex/media9/javascript/3Dmenu.js b/Master/texmf-dist/tex/latex/media9/javascript/3Dmenu.js
index a0b04d915ae..8d791a9734f 100644
--- a/Master/texmf-dist/tex/latex/media9/javascript/3Dmenu.js
+++ b/Master/texmf-dist/tex/latex/media9/javascript/3Dmenu.js
@@ -4,7 +4,7 @@
//
// 3Dmenu.js
//
-// version 20131126
+// version 20131127
//
////////////////////////////////////////////////////////////////////////////////
//
@@ -57,7 +57,7 @@
// set of points; see: http://www.inf.ethz.ch/personal/gaertner/miniball.html
//
////////////////////////////////////////////////////////////////////////////////
-host.console.show();
+//host.console.show();
//constructor for doubly linked list
function List(){
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index d19a615d251..23f9cdb07da 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -42,8 +42,8 @@
\RequirePackage{atbegshi}
\RequirePackage{tikz}
-\def\g@mix@date@tl{2013/11/26}
-\def\g@mix@version@tl{0.36}
+\def\g@mix@date@tl{2013/11/27}
+\def\g@mix@version@tl{0.37}
\def\g@mix@liiikerneldate{2013/07/28}
\def\g@mix@liiipkgdate{2013/07/28}
@@ -910,8 +910,8 @@
\cs_new:Nn\mix_embedasset:n{ %#1 file name or url
%check if #1 is online resource
- \bool_set_false:N\l_mix_url_bool
- \regex_match:nnT{(^[Hh][Tt][Tt][Pp][Ss]?|^[Ff][Tt][Pp]):\/\/}{#1}{
+ \bool_set_false:N\l_mix_url_bool\tl_set:Nx\l_tmpa_tl{#1}
+ \regex_match:nVT{(^[Hh][Tt][Tt][Pp][Ss]?|^[Ff][Tt][Pp]):\/\/}\l_tmpa_tl{
\bool_set_true:N\l_mix_url_bool
}
\filename@parse{#1}
@@ -2278,6 +2278,7 @@
\cs_new:Npn\mix_separate_cmd_from_actn:w#1[#2]#3\q_stop{#1}
\cs_new:Npn\mix_separate_arg_from_actn:w#1[#2]#3\q_stop{#2}
\cs_generate_variant:Nn\regex_match:nnTF{nV}
+\cs_generate_variant:Nn\regex_match:nnT{nV}
\cs_generate_variant:Nn\tl_if_blank:nF{c}
\bool_new:N\g_mix_btndraft_bool