5 files changed, 20 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 8ecb5a536ce..d137e29f9de 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-17
+	* v1.0 : media9.sty
+	* v0.31 : pdfbase.sty
+	* fix : pdfbase: missing expansion when writing label to
+	aux file (PDF dest, dvips)
+
 2019-05-15
 	* v0.99 : media9.sty
 	* v0.30 : pdfbase.sty
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index fbbc38640fd..bbc75449d53 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/media9.tex b/Master/texmf-dist/source/latex/media9/media9.tex
index 6aa3681a7a4..628384f736a 100644
--- a/Master/texmf-dist/source/latex/media9/media9.tex
+++ b/Master/texmf-dist/source/latex/media9/media9.tex
@@ -126,10 +126,7 @@ The final PDF can be viewed in current Adobe Readers on MS Windows and other pla
 
 \section{Requirements}
 \begin{trivlist}
-\makeatletter
-\item l3kernel (\LaTeX{} package), version $\ge \g@mix@liiikerneldate$
-\item l3packages (\LaTeX{} package), version $\ge \g@mix@liiipkgdate$
-\makeatother
+\item l3kernel (\LaTeX{} package), version $\ge \ExplFileDate$
 \item pdf\TeX{}, version $\ge1.40$
 \item Ghostscript, version $\ge9.15$, or Adobe Distiller for PS to PDF conversion
 \item dvipdfmx, version $\ge 20190503$ for DVI to PDF conversion
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index bc9f81dea1c..77cef083d06 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -45,11 +45,8 @@
 \RequirePackage{xparse}
 \RequirePackage{atbegshi}
 
-\def\g@mix@date@tl{2019/05/15}
-\def\g@mix@version@tl{0.99}
-
-\def\g@mix@liiikerneldate{2019/02/15}
-\def\g@mix@liiipkgdate{2018/10/17}
+\def\g@mix@date@tl{2019/05/17}
+\def\g@mix@version@tl{1.0}
 
 \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
 {acrobat-9/X compatible media}
diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
index d72aa09aa73..4743233da47 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -169,8 +169,8 @@
 \RequirePackage{expl3}
 \RequirePackage{l3keys2e}
 
-\def\g@pbs@date@tl{2019/05/15}
-\def\g@pbs@version@tl{0.30}
+\def\g@pbs@date@tl{2019/05/17}
+\def\g@pbs@version@tl{0.31}
 
 \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
 {driver independent access to low-level PDF features}
@@ -547,8 +547,12 @@
   }
   \int_new:N\g_pbs_obj_int %object ID
   \bool_if:NTF\g_pbs_dvipdfmx_bool{ %dvipdfmx/XeTeX
-    %suppress any annotation growth through (x)dvipdfmx option/config var `g'
-    \AtBeginDocument{\special{dvipdfmx:config~g~0}}
+    \AtBeginDocument{
+      % suppress any annotation growth through (x)dvipdfmx option/config var `g'
+      \special{dvipdfmx:config~g~0}
+      % suppress link destination renaming (as in original dvipdfm
+      \special{dvipdfmx:config~C~0x10}   %  and in pre-2014 dvipdfmx)
+    }
 
     %literal PDF code into content stream; open text objects are always closed
     \cs_new_protected_nopar:Nn\pbs_literal:nn{ % #1: empty (`'), `direct' or `page'
@@ -995,8 +999,9 @@
         \leavevmode
         \group_begin:
         %write destination page number to aux
-        \iow_shipout_x:Nn\@mainaux{
-          \token_to_str:N\pbs@newkey{pbs@#1@destpage}{\int_use:N\g_pbs_page_int}
+        \iow_shipout_x:Nx\@mainaux{
+          \token_to_str:N\pbs@newkey{pbs@#1@destpage}{
+            \exp_not:N\int_use:N\exp_not:N\g_pbs_page_int}
         }
         \cs_if_exist:cF{pbs@#1@destpage}{
           \tl_set:cn{pbs@#1@destpage}{0}