media9 (24nov15)

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

2 files changed, 14 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 9bf6926a2b8..e8dd365c796 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -41,7 +41,7 @@
 \RequirePackage{atbegshi}
 \RequirePackage{atenddvi}
 
-\def\g@mix@date@tl{2015/11/02}
+\def\g@mix@date@tl{2015/11/23}
 \def\g@mix@version@tl{0.60}
 
 \def\g@mix@liiikerneldate{2015/09/27}
diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
index 9d4715256b5..cc8bc873bd9 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -101,16 +101,17 @@
 \RequirePackage{expl3}
 \RequirePackage{l3regex}
 \RequirePackage{l3keys2e}
+\RequirePackage{atbegshi}
 \RequirePackage{atenddvi}
 
-\def\g@pbs@date@tl{2015/11/02}
-\def\g@pbs@version@tl{0.2}
+\def\g@pbs@date@tl{2015/11/23}
+\def\g@pbs@version@tl{0.3}
 
 \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
 {driver independent access to low-level PDF features}
 
 %wrong image file type for Image XObject generation
-\msg_set:nnn{pdfbase}{wrong~image~resource}{
+\msg_gset:nnn{pdfbase}{wrong~image~resource}{
   Image~resource~file\\~~'#1'\\has~wrong~type.\\\\
   Driver~#2~only~accepts~files~of~type\\#3\\
   as~image~resources.
@@ -126,14 +127,13 @@
 %package options
 
 %unknown package option error message
-\msg_set:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
+\msg_gset:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
   Package option~'#1'~is~unknown;\\
   perhaps~it~is~spelled~incorrectly.
 }
 
 \bool_new:N\g_pbs_pkgbigfiles_bool
 \bool_new:N\g_pbs_dvipdfmx_bool
-\bool_new:N\g_pbs_twocolumn_bool
 
 \keys_define:nn{pdfbase}{
   xetex .bool_gset:N = \g_pbs_dvipdfmx_bool,
@@ -146,9 +146,7 @@
 
   unknown .code:n = {
     \msg_error:nnx{pdfbase}{unknown~package~option}{\l_keys_key_tl}
-  },
-
-  twocolumn .bool_gset:N = \g_pbs_twocolumn_bool
+  }
 }
 \ProcessKeysOptions{pdfbase}
 \sys_if_engine_xetex:T{\bool_gset_true:N\g_pbs_dvipdfmx_bool}
@@ -210,10 +208,10 @@
 
   \cs_new:Nn\pbs_pdfcatalog:n{\pdfcatalog{#1}}
 
-  \int_new:N\g_pbs_oc_int % object ID
+  \int_new:N\g_pbs_oc_int % object ID for marked content Properties
 
   \cs_new:Nn\pbs_pdfbdc:nn{
-    \pdfliteral~direct~{#1/rm@oc\int_use:N\g_pbs_oc_int\space BDC}
+    \immediate\pdfliteral~direct~{#1/rm@oc\int_use:N\g_pbs_oc_int\space BDC}
     \tl_if_empty:NTF\g_pbs_ocmap_tl{
       \tl_gset:Nx\g_pbs_ocmap_tl{/rm@oc\int_use:N\g_pbs_oc_int\space#2}
     }{
@@ -233,16 +231,14 @@
   \tl_new:N\g_pbs_ocmap_tl
   \regex_const:Nn\l_pbs_regex{\/Properties<<(?:\s*\/rm@oc[^R]+R\s*)+>>}
 
+  \cs_new:Nn\pbs_pdfemc:{\immediate\pdfliteral~direct~{EMC}}
+
   %modify output routine to purge \pdfpageresources from OCG properties
-  \int_new:N\g_pbs_columns_int
+  \AtBeginShipout{\tl_gclear:N\g_pbs_ocmap_tl}
   \tl_gset:Nx\g_pbs_output_tl{\the\output}
   \global\output{
     \g_pbs_output_tl
-    \int_gincr:N\g_pbs_columns_int
-    \bool_if:nT{
-      !\g_pbs_twocolumn_bool || \int_if_even_p:n{\int_use:N\g_pbs_columns_int}
-    }{  
-      \tl_gclear:N\g_pbs_ocmap_tl
+    \tl_if_blank:VT\g_pbs_ocmap_tl{
       \tl_set:Nx\l_pbs_pdfpageresources_tl{\the\pdfpageresources}
       \regex_replace_all:NnN\l_pbs_regex{}\l_pbs_pdfpageresources_tl
       \group_begin:
@@ -251,8 +247,6 @@
       }\l_pbs_temp_tl
     }
   }
-
-  \cs_new:Nn\pbs_pdfemc:{\pdfliteral~direct~{EMC}}
 }{
   %pgf + transparency related settings
   \bool_new:N\g_pbs_pgfloaded_bool
@@ -659,3 +653,4 @@
   print}~if}~?pdfmark
 }
 \group_end:
+