diff options
author | Karl Berry <karl@freefriends.org> | 2017-08-24 21:59:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-08-24 21:59:05 +0000 |
commit | 9a1bbec62ce49dcc736d47fcdfaa608a945e2b40 (patch) | |
tree | afedd518ab0d8575d63f76d091c2d65f12fb5c88 | |
parent | ac09420035e5dca6d9e71c4565eb179c649c7d91 (diff) |
media9 (24aug17)
git-svn-id: svn://tug.org/texlive/trunk@45110 c570f23f-e606-0410-a88d-b1316a301751
16 files changed, 97 insertions, 163 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog index 67b8359b31a..7eddde58368 100644 --- a/Master/texmf-dist/doc/latex/media9/ChangeLog +++ b/Master/texmf-dist/doc/latex/media9/ChangeLog @@ -1,3 +1,8 @@ +2017-08-23 + * v0.84 : media9.sty + * v0.16 : pdfbase.sty + * fix : output routine adjustments (pdfbase.sty) + 2017-07-27 * v0.83 : media9.sty * fix : non-functional \mediabutton (broken in v. 0.81) diff --git a/Master/texmf-dist/doc/latex/media9/README b/Master/texmf-dist/doc/latex/media9/README deleted file mode 100644 index b77022632ee..00000000000 --- a/Master/texmf-dist/doc/latex/media9/README +++ /dev/null @@ -1,80 +0,0 @@ - ========================== - The media9 LaTeX Package - ========================== - - -Author: - -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 -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/help/Catalogue/licenses.lppl.html - -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 new file mode 100644 index 00000000000..5afc54c2a98 --- /dev/null +++ b/Master/texmf-dist/doc/latex/media9/README.md @@ -0,0 +1,47 @@ +# 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/tex-archive/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 Binary files differindex b20d220e039..a08e5ad2df0 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 965138453b8..9e4f88c82df 100644 --- a/Master/texmf-dist/source/latex/media9/media9.tex +++ b/Master/texmf-dist/source/latex/media9/media9.tex @@ -1,7 +1,7 @@ % Copyright 2012--\today Alexander Grahn % % This material is subject to the LaTeX Project Public License. See -% http://mirror.ctan.org/help/Catalogue/licenses.lppl.html +% http://mirrors.ctan.org/tex-archive/macros/latex/base/lppl.txt % for the details of that license. % \pdfcompresslevel=0 diff --git a/Master/texmf-dist/source/latex/media9/players/APlayer.mxml b/Master/texmf-dist/source/latex/media9/players/APlayer.mxml index 29dcd64df0f..b03f04a4fc1 100644 --- a/Master/texmf-dist/source/latex/media9/players/APlayer.mxml +++ b/Master/texmf-dist/source/latex/media9/players/APlayer.mxml @@ -22,14 +22,10 @@ <!-- Copyright (C) 2012-today Alexander Grahn --> <!-- --> <!-- This work may be distributed and/or modified under the --> -<!-- conditions of the LaTeX Project Public License, either --> -<!-- version 1.3 of this license or (at your option) any later --> -<!-- version. --> +<!-- conditions of the LaTeX Project Public License. --> <!-- --> <!-- The latest version of this license is in --> <!-- http://www.latex-project.org/lppl.txt --> -<!-- and version 1.3 or later is part of all distributions of --> -<!-- LaTeX version 2005/12/01 or later. --> <!-- --> <!-- This work has the LPPL maintenance status `maintained'. --> <!-- --> diff --git a/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml b/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml index aae99ffcb27..9ea40902dff 100644 --- a/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml +++ b/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml @@ -9,14 +9,10 @@ <!-- Copyright (C) 2012-today Alexander Grahn --> <!-- --> <!-- This work may be distributed and/or modified under the --> -<!-- conditions of the LaTeX Project Public License, either --> -<!-- version 1.3 of this license or (at your option) any later --> -<!-- version. --> +<!-- conditions of the LaTeX Project Public License. --> <!-- --> <!-- The latest version of this license is in --> <!-- http://www.latex-project.org/lppl.txt --> -<!-- and version 1.3 or later is part of all distributions of --> -<!-- LaTeX version 2005/12/01 or later. --> <!-- --> <!-- This work has the LPPL maintenance status `maintained'. --> <!-- --> diff --git a/Master/texmf-dist/source/latex/media9/players/SlideShow.mxml b/Master/texmf-dist/source/latex/media9/players/SlideShow.mxml index dd6138d420f..c55c41fd13c 100644 --- a/Master/texmf-dist/source/latex/media9/players/SlideShow.mxml +++ b/Master/texmf-dist/source/latex/media9/players/SlideShow.mxml @@ -22,14 +22,10 @@ <!-- Copyright (C) 2015-today Alexander Grahn --> <!-- --> <!-- This work may be distributed and/or modified under the --> -<!-- conditions of the LaTeX Project Public License, either --> -<!-- version 1.3 of this license or (at your option) any later --> -<!-- version. --> +<!-- conditions of the LaTeX Project Public License. --> <!-- --> <!-- The latest version of this license is in --> <!-- http://www.latex-project.org/lppl.txt --> -<!-- and version 1.3 or later is part of all distributions of --> -<!-- LaTeX version 2005/12/01 or later. --> <!-- --> <!-- This work has the LPPL maintenance status `maintained'. --> <!-- --> diff --git a/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml b/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml index ce7f1ee2fe0..225afadc66b 100644 --- a/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml +++ b/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml @@ -22,14 +22,10 @@ <!-- Copyright (C) 2012-today Alexander Grahn --> <!-- --> <!-- This work may be distributed and/or modified under the --> -<!-- conditions of the LaTeX Project Public License, either --> -<!-- version 1.3 of this license or (at your option) any later --> -<!-- version. --> +<!-- conditions of the LaTeX Project Public License. --> <!-- --> <!-- The latest version of this license is in --> <!-- http://www.latex-project.org/lppl.txt --> -<!-- and version 1.3 or later is part of all distributions of --> -<!-- LaTeX version 2005/12/01 or later. --> <!-- --> <!-- This work has the LPPL maintenance status `maintained'. --> <!-- --> diff --git a/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml b/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml index ca7e74c64ac..6741267f107 100644 --- a/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml +++ b/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml @@ -9,14 +9,10 @@ <!-- Copyright (C) 2012-today Alexander Grahn --> <!-- --> <!-- This work may be distributed and/or modified under the --> -<!-- conditions of the LaTeX Project Public License, either --> -<!-- version 1.3 of this license or (at your option) any later --> -<!-- version. --> +<!-- conditions of the LaTeX Project Public License. --> <!-- --> <!-- The latest version of this license is in --> <!-- http://www.latex-project.org/lppl.txt --> -<!-- and version 1.3 or later is part of all distributions of --> -<!-- LaTeX version 2005/12/01 or later. --> <!-- --> <!-- This work has the LPPL maintenance status `maintained'. --> <!-- --> diff --git a/Master/texmf-dist/tex/latex/media9/javascript/3Dmenu.js b/Master/texmf-dist/tex/latex/media9/javascript/3Dmenu.js index 36cbd4bdeb5..5cd1893cba9 100644 --- a/Master/texmf-dist/tex/latex/media9/javascript/3Dmenu.js +++ b/Master/texmf-dist/tex/latex/media9/javascript/3Dmenu.js @@ -41,15 +41,13 @@ // Control key pressed while using the Up/Down and Left/Right arrow keys. // // This work may be distributed and/or modified under the -// conditions of the LaTeX Project Public License, either version 1.3 -// of this license or (at your option) any later version. +// conditions of the LaTeX Project Public License. +// // The latest version of this license is in -// http://www.latex-project.org/lppl.txt -// and version 1.3 or later is part of all distributions of LaTeX -// version 2005/12/01 or later. -// +// http://mirrors.ctan.org/tex-archive/macros/latex/base/lppl.txt +// // This work has the LPPL maintenance status `maintained'. -// +// // The Current Maintainer of this work is A. Grahn. // // The code borrows heavily from Bernd Gaertners `Miniball' software, diff --git a/Master/texmf-dist/tex/latex/media9/javascript/3Dspintool.js b/Master/texmf-dist/tex/latex/media9/javascript/3Dspintool.js index ed348d37bec..46001890e19 100644 --- a/Master/texmf-dist/tex/latex/media9/javascript/3Dspintool.js +++ b/Master/texmf-dist/tex/latex/media9/javascript/3Dspintool.js @@ -15,15 +15,13 @@ // axis while dragging with the mouse // // This work may be distributed and/or modified under the -// conditions of the LaTeX Project Public License, either version 1.3 -// of this license or (at your option) any later version. +// conditions of the LaTeX Project Public License. +// // The latest version of this license is in -// http://www.latex-project.org/lppl.txt -// and version 1.3 or later is part of all distributions of LaTeX -// version 2005/12/01 or later. -// +// http://mirrors.ctan.org/tex-archive/macros/latex/base/lppl.txt +// // This work has the LPPL maintenance status `maintained'. -// +// // The Current Maintainer of this work is A. Grahn. // //////////////////////////////////////////////////////////////////////////////// diff --git a/Master/texmf-dist/tex/latex/media9/javascript/animation.js b/Master/texmf-dist/tex/latex/media9/javascript/animation.js index c09ac17d58d..a5b423bf1bf 100644 --- a/Master/texmf-dist/tex/latex/media9/javascript/animation.js +++ b/Master/texmf-dist/tex/latex/media9/javascript/animation.js @@ -20,13 +20,11 @@ var rate = 1; // 1 --> use original speed as default var palindrome = true; // true --> play forth and back // // This work may be distributed and/or modified under the -// conditions of the LaTeX Project Public License, either version 1.3 -// of this license or (at your option) any later version. +// conditions of the LaTeX Project Public License. +// // The latest version of this license is in -// http://www.latex-project.org/lppl.txt -// and version 1.3 or later is part of all distributions of LaTeX -// version 2005/12/01 or later. -// +// http://mirrors.ctan.org/tex-archive/macros/latex/base/lppl.txt +// // This work has the LPPL maintenance status `maintained'. // // The Current Maintainer of this work is A. Grahn. diff --git a/Master/texmf-dist/tex/latex/media9/javascript/asylabels.js b/Master/texmf-dist/tex/latex/media9/javascript/asylabels.js index 505674a7438..0c231938952 100644 --- a/Master/texmf-dist/tex/latex/media9/javascript/asylabels.js +++ b/Master/texmf-dist/tex/latex/media9/javascript/asylabels.js @@ -16,13 +16,11 @@ // // // This work may be distributed and/or modified under the -// conditions of the LaTeX Project Public License, either version 1.3 -// of this license or (at your option) any later version. +// conditions of the LaTeX Project Public License. +// // The latest version of this license is in -// http://www.latex-project.org/lppl.txt -// and version 1.3 or later is part of all distributions of LaTeX -// version 2005/12/01 or later. -// +// http://mirrors.ctan.org/tex-archive/macros/latex/base/lppl.txt +// // This work has the LPPL maintenance status `maintained'. // // The Current Maintainer of this work is A. Grahn. diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index 4709df1a6f9..a19139ac6e7 100644 --- a/Master/texmf-dist/tex/latex/media9/media9.sty +++ b/Master/texmf-dist/tex/latex/media9/media9.sty @@ -23,12 +23,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. +% conditions of the LaTeX Project Public License. +% % The latest version of this license is in -% http://mirrors.ctan.org/help/Catalogue/licenses.lppl.html -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. +% http://mirrors.ctan.org/tex-archive/macros/latex/base/lppl.txt % % This work has the LPPL maintenance status `maintained'. % @@ -39,8 +37,8 @@ \RequirePackage{xparse} \RequirePackage{atbegshi} -\def\g@mix@date@tl{2017/07/27} -\def\g@mix@version@tl{0.83} +\def\g@mix@date@tl{2017/08/23} +\def\g@mix@version@tl{0.84} \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 63a9ea3edd0..201c415b8db 100644 --- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty +++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty @@ -116,12 +116,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. +% conditions of the LaTeX Project Public License. +% % The latest version of this license is in -% http://mirrors.ctan.org/help/Catalogue/licenses.lppl.html -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. +% http://mirrors.ctan.org/tex-archive/macros/latex/base/lppl.txt % % This work has the LPPL maintenance status `maintained'. % @@ -130,8 +128,8 @@ \RequirePackage{expl3} \RequirePackage{l3keys2e} -\def\g@pbs@date@tl{2017/07/24} -\def\g@pbs@version@tl{0.15} +\def\g@pbs@date@tl{2017/08/23} +\def\g@pbs@version@tl{0.16} \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} {driver independent access to low-level PDF features} @@ -242,7 +240,6 @@ \cs_new_nopar:Nn\pbs_second_of_two:nn{#2} \cs_new_nopar:Nn\pbs_insert_properties_entry:{} -\cs_new_nopar:Nn\pbs_delete_properties_entry:{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %commands for creating PDF objects, annots etc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -422,11 +419,6 @@ }\l_pbs_temp_tl } } - - %deletes /Properties <<...>> from page resources - \cs_gset:Nn\pbs_delete_properties_entry:{ - \pbs_zap_properties: - } }{ %pgf + transparency related settings \bool_new:N\g_pbs_pgfloaded_bool @@ -946,7 +938,7 @@ \tl_new:N\g_pbs_acroFormAdded_tl } \cs_new_nopar:Nn\pbs_appendtofields:n{ - \tl_gput_right:Nx\g_pbs_fields_tl{#1\space} + \tl_gput_left:Nx\g_pbs_fields_tl{#1\space} } %modify output routine for output box insertions @@ -956,23 +948,23 @@ \iow_now:Nx\@mainaux{ \token_to_str:N\pbs@newkey{pbs@last@page}{\int_use:N\g_pbs_page_int} } - \hbox_set:Nn\@outputbox{ - \seq_map_inline:Nn\g_pbs_bop_seq{\hbox_to_zero:n{##1\hss}} - \tl_set:Nx\l_pbs_box_wd_tl{\dim_use:N\box_wd:N\@outputbox} + \vbox_set:Nn\@outputbox{ + %begin of page + \seq_map_inline:Nn\g_pbs_bop_seq{ + \hbox_overlap_right:n{\vbox_to_zero:n{##1 \vss}}} \box_use_clear:N\@outputbox - \skip_horizontal:n{-\l_pbs_box_wd_tl} - \seq_map_inline:Nn\g_pbs_eop_seq{\hbox_to_zero:n{##1\hss}} - %at end of dvi + %end of page + \seq_map_inline:Nn\g_pbs_eop_seq{ + \hbox_overlap_right:n{\vbox_to_zero:n{\vss ##1}}} + %end of dvi \int_compare:nT{\pbs@last@page=\g_pbs_page_int}{ - \seq_map_inline:Nn\g_pbs_eod_seq{\hbox_to_zero:n{##1\hss}} + \seq_map_inline:Nn\g_pbs_eod_seq{ + \hbox_overlap_right:n{\vbox_to_zero:n{\vss ##1}}} } } %insert /Properties into current page's resources \pbs_insert_properties_entry: \pbs_outputpage_orig: - %purge /Properties from current page's resources, - %because they aren't needed any longer - \pbs_delete_properties_entry: } \group_begin: |