From c492fcca271ba84bff91e6b6237a981061ccc10d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 26 Aug 2013 21:56:14 +0000 Subject: media9 (26aug13) git-svn-id: svn://tug.org/texlive/trunk@31523 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/media9/ChangeLog | 4 +++ Master/texmf-dist/doc/latex/media9/media9.pdf | Bin 2753905 -> 2754030 bytes Master/texmf-dist/tex/latex/media9/media9.sty | 36 ++++++++------------------ 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog index 305dfecc0a7..60aa7672643 100644 --- a/Master/texmf-dist/doc/latex/media9/ChangeLog +++ b/Master/texmf-dist/doc/latex/media9/ChangeLog @@ -1,3 +1,7 @@ +2013-08-26 + * v0.31 + * fix: expl3 related fix for correct 3D views file processing + 2013-08-16 * v0.30 * change: update to current expl3 version diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf index bf19c5fb3db..8f47e944864 100644 Binary files a/Master/texmf-dist/doc/latex/media9/media9.pdf and b/Master/texmf-dist/doc/latex/media9/media9.pdf differ diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index 59538adc831..056c855408d 100644 --- a/Master/texmf-dist/tex/latex/media9/media9.sty +++ b/Master/texmf-dist/tex/latex/media9/media9.sty @@ -16,7 +16,7 @@ % Supported workflows: % % pdflatex, lualatex -% (lua)latex-->dvips-->ps2pdf/Distiller +% latex-->dvips-->ps2pdf or Distiller % latex-->dvipdfmx % xelatex % @@ -41,8 +41,8 @@ \RequirePackage{ifpdf} \RequirePackage{atbegshi} -\def\g@mix@date@tl{2013/08/16} -\def\g@mix@version@tl{0.30} +\def\g@mix@date@tl{2013/08/26} +\def\g@mix@version@tl{0.31} \def\g@mix@liiikerneldate{2013/07/28} \def\g@mix@liiipkgdate{2013/07/28} @@ -438,14 +438,13 @@ \group_begin: \char_set_catcode_active:N\+\let+\space \tl_gset:Nx\g_mix_dpiwarning_tl{ - {Resolution~1200~gt~VResolution~1200~gt~or~product~(Ghostscript) - search~{pop~pop~pop~true}{pop~false}ifelse~and~{ + {Resolution~1200~gt~VResolution~1200~gt~or~{ (@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\token_to_str:N\n @@++++Warning:+DVI+resolution+greater+than+1200+dpi!+++++@@\token_to_str:N\n @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\token_to_str:N\n @@+++++++++++++++++++++++++++++++++++++++++++++++++++++++@@\token_to_str:N\n - @@+Media+poster+and+button+faces+may+be+distorted+or+++++@@\token_to_str:N\n - @@+invisible.++++++++++++++++++++++++++++++++++++++++++++@@\token_to_str:N\n + @@+Media+poster+and+button+faces+may+be+poorly+scaled+or+@@\token_to_str:N\n + @@+invisible+in+the+PDF+output.++++++++++++++++++++++++++@@\token_to_str:N\n @@+++++++++++++++++++++++++++++++++++++++++++++++++++++++@@\token_to_str:N\n @@+Dvips+should+be+called+either+without+option+`-Ppdf':+@@\token_to_str:N\n @@+++++++++++++++++++++++++++++++++++++++++++++++++++++++@@\token_to_str:N\n @@ -1192,27 +1191,12 @@ \tl_set:Nn\l_mix_level_tl{\c_minus_one} \int_zero:N\l_mix_viewcnt_int \int_zero:N\l_mix_lineno_int - \ior_open:Nn\l_mix_vfile_stream{\g_mix_vfile_tl} - \group_begin: - \endlinechar=\c_minus_one - \ior_get_str:NN\l_mix_vfile_stream\l_mix_inputline_tl - \tl_gset_eq:NN\g_mix_inputline_tl\l_mix_inputline_tl - \group_end: - \bool_until_do:nn{\ior_if_eof_p:N\l_mix_vfile_stream}{ + \ior_open:Nn\l_mix_vfile_stream{\g_mix_vfile_tl} + \ior_map_inline:Nn\l_mix_vfile_stream{ \int_incr:N\l_mix_lineno_int - %process input line - \tl_if_blank:VF\g_mix_inputline_tl{ - \tl_set:Nx\l_mix_args_tl{{media9/views}{\g_mix_inputline_tl}} - \exp_after:wN\keys_set:nn\l_mix_args_tl - } - \group_begin: - \endlinechar=\c_minus_one - \ior_get_str:NN\l_mix_vfile_stream\l_mix_inputline_tl - \tl_gset_eq:NN\g_mix_inputline_tl\l_mix_inputline_tl - \group_end: + \keys_set:nn{media9/views}{##1} %process input line } - \ior_close:N\l_mix_vfile_stream } \bool_if:nT{ %create default 3D view if required @@ -1902,6 +1886,8 @@ %keys for parsing the 3D views file \keys_define:nn{media9/views}{ + \par .code:n = {}, %allow for but ignore empty lines + VIEW .code:n = { \int_compare:nF{\l_mix_level_tl<\c_zero}{ \msg_error:nnxx{media9}{nested~view} -- cgit v1.2.3