media9 (16jan18)

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

5 files changed, 26 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 933a42d5a3c..3a151b36832 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-16
+	* v0.88 : media9.sty
+	* v0.19 : pdfbase.sty
+	* fix : pdfbase.sty: improving \pbs_at_end_dvi:n using `atbegshi' package
+
 2018-01-04
 	* v0.87 : media9.sty
 	* fix : media9.sty: fixing `kernel/invalid-variant' warnings
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index d8c917f8297..ab0acbe5068 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/source/latex/media9/files/bird.mp3 b/Master/texmf-dist/source/latex/media9/files/bird.mp3
new file mode 100644
index 00000000000..c9bee679cd6
--- /dev/null
+++ b/Master/texmf-dist/source/latex/media9/files/bird.mp3
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index d3defa9a6e5..35b7cfa0270 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -37,8 +37,8 @@
 \RequirePackage{xparse}
 \RequirePackage{atbegshi}
 
-\def\g@mix@date@tl{2018/01/04}
-\def\g@mix@version@tl{0.87}
+\def\g@mix@date@tl{2018/01/16}
+\def\g@mix@version@tl{0.88}
 
 \def\g@mix@liiikerneldate{2017/05/29}
 \def\g@mix@liiipkgdate{2017/05/29}
diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
index 9643557cd05..b6258cf39f3 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -137,8 +137,8 @@
 \RequirePackage{expl3}
 \RequirePackage{l3keys2e}
 
-\def\g@pbs@date@tl{2017/09/29}
-\def\g@pbs@version@tl{0.18}
+\def\g@pbs@date@tl{2018/01/16}
+\def\g@pbs@version@tl{0.19}
 
 \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
 {driver independent access to low-level PDF features}
@@ -987,15 +987,12 @@
 
 %adding AcroForm dict to PDF Catalog
 \tl_new:N\g_pbs_fields_tl %takes object IDs of Fields (aka annots with
-\tl_if_exist:NF\g_pbs_acroFormAdded_tl{             %   /Subtype/Widget)
-  \pbs_at_end_dvi:n{
-    \tl_if_empty:NF\g_pbs_fields_tl{
-      \pbs_pdfobj:nnn{}{array}{\g_pbs_fields_tl}
-      \pbs_pdfcatalog:n{
-        /AcroForm~<</Fields~\pbs_pdflastobj:/NeedAppearances~false>>}
-    }
+\pbs_at_end_dvi:n{
+  \tl_if_empty:NF\g_pbs_fields_tl{
+    \pbs_pdfobj:nnn{}{array}{\g_pbs_fields_tl}
+    \pbs_pdfcatalog:n{
+      /AcroForm~<</Fields~\pbs_pdflastobj:/NeedAppearances~false>>}
   }
-  \tl_new:N\g_pbs_acroFormAdded_tl
 }
 \cs_new_nopar:Nn\pbs_appendtofields:n{
   \tl_gput_left:Nx\g_pbs_fields_tl{#1\space}
@@ -1020,19 +1017,25 @@
     \box_use_clear:N\@outputbox
     %end of page
     \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eop_seq{##1}}
-    %end of dvi
-    \int_compare:nT{\pbs@last@page=\g_pbs_page_int}{
-      \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eod_seq{##1}}
-    }
   }
   \bool_if:NT\l_pbs_is_vertical_bool{
     \vbox_set:Nn\@outputbox{\box_use_clear:N\@outputbox}
   }
-  %insert /Properties into current page's resources
-  \pbs_insert_properties_entry:
   \pbs_outputpage_orig:
 }
 
+\RequirePackage{atbegshi}
+\AtBeginShipout{
+  \AtBeginShipoutAddToBoxForeground{
+    %insert /Properties into current page's resources
+    \pbs_insert_properties_entry:
+    %end of dvi (last page)
+    \int_compare:nT{\pbs@last@page=\g_pbs_page_int}{
+      \seq_map_variable:NNn\g_pbs_eod_seq\l_tmpa_tl{\l_tmpa_tl}
+    }
+  }
+}
+
 \group_begin:
 \char_set_catcode_active:N\+\let+\space
 \cs_new_nopar:Nx\pbs_gsoldwarning:{