6 files changed, 86 insertions, 53 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index d5ea6c27577..933a42d5a3c 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-04
+	* v0.87 : media9.sty
+	* fix : media9.sty: fixing `kernel/invalid-variant' warnings
+
 2017-09-29
 	* v0.86 : media9.sty
 	* v0.18 : pdfbase.sty
diff --git a/Master/texmf-dist/doc/latex/media9/README b/Master/texmf-dist/doc/latex/media9/README
new file mode 100644
index 00000000000..393e914a48d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/media9/README
@@ -0,0 +1,76 @@
+==================================
+ The media9 LaTeX Package
+
+ https://github.com/agrahn/media9
+
+ (C) 2012--\today Alexander Grahn
+==================================
+
+This package provides an interface to embed interactive Flash (SWF) and
+3D objects (Adobe U3D & PRC) as well as video and sound files or streams
+in the popular MP4, FLV, MP3 formats into PDF documents with Acrobat-9/X
+compatibility. Playback of multimedia files relies on Adobe Flash Player
+which supports the efficient H.264 codec for video compression.
+
+This package is based on the RichMedia Annotation, an Adobe addition to
+the PDF specification. It replaces the now obsolete `movie15' package.
+
+*
+* Note that Adobe Reader for Linux has dropped Flash support since
+* version 9.4.2.
+*
+
+Supported PDF making workflows are:
+  *  pdfLaTeX, LuaLaTeX
+  *  (Lua)LaTeX --> dvips --> ps2pdf/Distiller
+  *  (Xe)LaTeX --> (x)dvipdfmx
+
+The package was written in the new LaTeX3 syntax.
+
+
+Requirements:
+
+  *  l3kernel (LaTeX package), version >=2012/07/16
+  *  l3packages (LaTeX package), version >=2012/07/16
+  *  pdfTeX, version >=1.30
+  *  Ghostscript, version >=8.31 or Adobe Distiller for PS to PDF conversion
+  *  dvipdfmx, version >=20120420 for DVI to PDF conversion
+  *  Adobe Reader, version >=9
+
+
+Installation:
+
+MiKTeX and TeXLive users should run the package manager for installation.
+
+Otherwise, a manual install into the local TeX-Directory-Structure
+(TDS) root directory can be done along the following steps:
+
+1.) Download the TDS compliant package file
+http://mirror.ctan.org/install/macros/latex/contrib/media9.tds.zip.
+
+2.) Find the local TDS root directory by running
+
+  kpsewhich -var-value TEXMFLOCAL
+
+on the command line.
+
+3.) Unzip media9.tds.zip into the local TDS root directory previously
+found. Depending on the location of this directory, you may need to be
+logged in as Root/Administrator.
+
+4.) After installation, update the filename database by running
+
+  texhash
+
+on the command line. Again, Root/Administrator privileges may be required.
+
+For updating the package, repeat the steps given above.
+
+
+License:
+
+This material is subject to the LaTeX Project Public License. See
+
+   http://mirrors.ctan.org/macros/latex/base/lppl.txt
+
+for the details of that license.
diff --git a/Master/texmf-dist/doc/latex/media9/README.md b/Master/texmf-dist/doc/latex/media9/README.md
deleted file mode 100644
index 30125741bdc..00000000000
--- a/Master/texmf-dist/doc/latex/media9/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# The `media9` LaTeX Package
-
-© 2012--`\today` Alexander Grahn
-
-## Description
-
-This package provides an interface to embed interactive Flash (SWF) and 3D objects (Adobe U3D & PRC) as well as video and sound files or streams in the popular MP4, FLV, MP3 formats into PDF documents with Acrobat-9/X compatibility. Playback of multimedia files relies on Adobe Flash Player which supports the efficient H.264 codec for video compression.
-
-This package is based on the RichMedia Annotation, an Adobe addition to the PDF specification. It replaces the now obsolete `movie15` package.
-
->Note that Adobe Reader for Linux has dropped Flash support since version 9.4.2.
-
-Supported PDF making workflows are:
-* pdfLaTeX, LuaLaTeX
-* (Lua)LaTeX ⇒ dvips ⇒ ps2pdf/Distiller
-* (Xe)LaTeX ⇒ (x)dvipdfmx
-
-The package was written in the new LaTeX3 syntax.
-
-## Requirements
-
-* l3kernel (LaTeX package), version >=2012/07/16
-* l3packages (LaTeX package), version >=2012/07/16
-* pdfTeX, version >=1.30
-* Ghostscript, version >=8.31 or Adobe Distiller for PS to PDF conversion
-* dvipdfmx, version >=20120420 for DVI to PDF conversion
-* Adobe Reader, version >=9
-
-## Installation
-
-MiKTeX and TeXLive users should run the package manager for installation.
-
-Otherwise, a manual install into the local TeX-Directory-Structure (TDS) root directory can be done along the following steps:
-
-1. Download the TDS compliant package file [`media9.tds.zip`](http://mirror.ctan.org/install/macros/latex/contrib/media9.tds.zip)
-
-2. Find the local TDS root directory by running `kpsewhich -var-value TEXMFLOCAL` on the command line.
-
-3. Unzip media9.tds.zip into the local TDS root directory previously found. Depending on the location of this directory, you may need to be logged in as Root/Administrator.
-
-4. After installation, update the filename database by running `texhash` on the command line. Again, Root/Administrator privileges may be required.
-
-For updating the package, repeat the steps given above.
-
-## License
-
-This material is subject to the [LaTeX Project Public License](http://mirrors.ctan.org/macros/latex/base/lppl.txt).
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 8205b00bd08..d8c917f8297 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
deleted file mode 100644
index c9bee679cd6..00000000000
--- a/Master/texmf-dist/source/latex/media9/files/bird.mp3
+++ /dev/null
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 2f1c9e3f621..d3defa9a6e5 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{2017/09/29}
-\def\g@mix@version@tl{0.86}
+\def\g@mix@date@tl{2018/01/04}
+\def\g@mix@version@tl{0.87}
 
 \def\g@mix@liiikerneldate{2017/05/29}
 \def\g@mix@liiipkgdate{2017/05/29}
@@ -2152,10 +2152,10 @@
 %helpers for option parsing
 \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}
-\cs_generate_variant:Nn\tl_if_eq:NNTF{Vn}
+\prg_generate_conditional_variant:Nnn\regex_match:nn{nV}{TF}
+\prg_generate_conditional_variant:Nnn\regex_match:nn{nV}{T}
+\prg_generate_conditional_variant:Nnn\tl_if_blank:n{v}{F}
+\prg_generate_conditional_variant:Nnn\tl_if_eq:nn{Vn}{TF}
 
 \bool_new:N\g_mix_btndraft_bool
 \keys_define:nn{media9/mbtndraft}{