diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/media9/ChangeLog | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/media9/media9.pdf | bin | 3735158 -> 3735214 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/media9/media9.tex | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/media9/media9.sty | 64 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/media9/pdfbase.sty | 16 |
5 files changed, 37 insertions, 53 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog index e82b6ab0172..e69d7414502 100644 --- a/Master/texmf-dist/doc/latex/media9/ChangeLog +++ b/Master/texmf-dist/doc/latex/media9/ChangeLog @@ -1,3 +1,9 @@ +2020-01-27 + * v1.05 : media9.sty + * v0.36 : pdfbase.sty + * fix : dependency on pdftexcmds.sty removed; deprecated l3 functions + replaced + 2019-11-04 * v1.04 : media9.sty * v0.35 : pdfbase.sty diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf Binary files differindex 691819ce4b7..982d8117586 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 715faca3714..202fc0bd582 100644 --- a/Master/texmf-dist/source/latex/media9/media9.tex +++ b/Master/texmf-dist/source/latex/media9/media9.tex @@ -17,7 +17,7 @@ \usepackage{fancyvrb} \usepackage{float} \usepackage{amssymb} -\usepackage[UKenglish]{babel} +\usepackage[main=UKenglish,nil]{babel} \usepackage{graphicx} \usepackage{color} \usepackage[T1]{fontenc} @@ -90,7 +90,7 @@ \begin{abstract}\noindent A \LaTeX{} package for embedding interactive Adobe Flash (SWF) and 3D files (Adobe U3D \& PRC) as well as video and sound files or streams (FLV, MP4/H.246, MP3) into PDF documents with Adobe Reader-9/X compatibility.\\[0.2\baselineskip] -\begin{sloppypar}\foreignlanguage{nohyphenation}{\noindent\emph{Keywords}: \keywords}\end{sloppypar} +\begin{sloppypar}\foreignlanguage{nil}{\noindent\emph{Keywords}: \keywords}\end{sloppypar} \end{abstract} \tableofcontents diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index 7d349864847..14ba62ef414 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{2019/11/04} -\def\g@mix@version@tl{1.04} +\def\g@mix@date@tl{2020/01/27} +\def\g@mix@version@tl{1.05} \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl} {acrobat-9/X compatible media} @@ -339,25 +339,6 @@ Line~\msg_line_number: :~ File~`#1'~not~found.}{Make~sure~file~`#1'~exists~and~is~readable!} -\sys_if_engine_pdftex:TF{ - %\pdfmdfivesum is used for hashing object references of embedded files - \cs_new:Nn\mix_filemdfivesum:n{\pdfmdfivesum~file~{#1}} - \cs_new:Nn\mix_unescapehex:n{(\pdfunescapehex{#1})} -}{ - \sys_if_engine_luatex:TF{ - \RequirePackage{pdftexcmds} - \cs_new_nopar:Nn\mix_filemdfivesum:n{\pdf@filemdfivesum{#1}} - %\cs_new:Nn\mix_unescapehex:n{<#1>} - \cs_new_nopar:Nn\mix_unescapehex:n{(\pdf@unescapehex{#1})} - }{ - \cs_if_exist:NTF\mdfivesum{ - \cs_new_nopar:Nn\mix_filemdfivesum:n{\mdfivesum file {#1}} - }{ - \cs_new_nopar:Nn\mix_filemdfivesum:n{#1} - } - } -} - %creating global definitions \cs_new:Npn\mix@newkey#1#2{\tl_gset:cx{#1}{#2}} \AtBeginDocument{ @@ -503,23 +484,22 @@ \tl_gset:Nx\g_mix_btnocg_tl{\ocgbase_last_ocg:} } -%output mode dependent command definitions -\sys_if_output_pdf:TF{ - \cs_new:Nn\mix_ndname:n{%#1:HEX encoded string - %converted to binary UTF16BE using \pdfunescapehex (pdfTeX only) - \tl_set:Nn\l_mix_ndname_tl{\mix_unescapehex:n{#1}} - } -}{ - \bool_if:NTF\g_mix_dvipdfmx_bool{ %dvipdfmx/XeTeX - \cs_new:Nn\mix_ndname:n{%#1:HEX encoded UTF16BE string - \tl_set:Nn\l_mix_ndname_tl{<#1>} +%output mode/engine dependent command definitions +\cs_new:Nn\mix_ndname:n{%#1:HEX encoded UTF16BE string + \sys_if_output_pdf:TF{ + \sys_if_engine_pdftex:TF{ %convert to binary UTF16BE as by \pdfunescapehex + \str_set_convert:Nnnn\l_mix_ndname_tl{feff#1}{utf16/hex}{utf16} + \tl_set:Nx\l_mix_ndname_tl{(\l_mix_ndname_tl)} + }{ %luatex + \tl_set:Nn\l_mix_ndname_tl{<feff#1>} } }{ - %3DNode name - \cs_new:Nn\mix_ndname:n{%#1:HEX encoded unicode string + \bool_if:NTF\g_mix_dvipdfmx_bool{ %dvipdfmx/XeTeX + \tl_set:Nn\l_mix_ndname_tl{<feff#1>} + }{ %dvips \special{ps:~ /mix@unicode~65535~string~def~ - (#1)~/ASCIIHexDecode~filter~mix@unicode~readstring~pop~ + (feff#1)~/ASCIIHexDecode~filter~mix@unicode~readstring~pop~ /mix@unicode~exch~def~ } %converted to binary UTF16BE by ps2pdf @@ -536,7 +516,7 @@ } \filename@parse{#1} \tl_set:Nx\l_mix_base_tl{\filename@base} - \tl_set:Nx\l_mix_ext_tl{\tl_lower_case:n{\filename@ext}} + \tl_set:Nx\l_mix_ext_tl{\text_lowercase:n{\filename@ext}} \bool_if:NTF\l_mix_url_bool{ \cs_if_exist:cF{url_#1}{ \mix_pdfobj:nnn{}{dict}{/FS/URL/F(#1)} @@ -568,16 +548,16 @@ || \str_if_eq_p:Vn\l_mix_ext_tl{pdf} ) }{ - \cs_if_exist:cF{imgXobj_\mix_filemdfivesum:n{\l_mix_file_tl}}{ + \cs_if_exist:cF{imgXobj_\file_mdfive_hash:n{\l_mix_file_tl}}{ \mix_pdfximage:n{\l_mix_file_tl} - \tl_gset:cx{imgXobj_\mix_filemdfivesum:n{\l_mix_file_tl}}{ + \tl_gset:cx{imgXobj_\file_mdfive_hash:n{\l_mix_file_tl}}{ \mix_pdflastximage: } } %create fake FileSpec for current file name if not yet existent \cs_if_exist:cF{ImgFileSpecFor3D_#1}{ \tl_gset:cx{ImgFileSpecFor3D_#1}{ - \tl_use:c{imgXobj_\mix_filemdfivesum:n{\l_mix_file_tl}} + \tl_use:c{imgXobj_\file_mdfive_hash:n{\l_mix_file_tl}} } } %add FileSpec to assets tree of current annot @@ -589,9 +569,9 @@ }{ %remaining file types in 3D context and any file type in case of Flash %context will be embedded as ordinary fstreams; - \cs_if_exist:cF{fileEmb_\mix_filemdfivesum:n{\l_mix_file_tl}}{ + \cs_if_exist:cF{fileEmb_\file_mdfive_hash:n{\l_mix_file_tl}}{ \mix_pdfobj:nnn{}{fstream}{{}{\l_mix_file_tl}} - \tl_gset:cx{fileEmb_\mix_filemdfivesum:n{\l_mix_file_tl}}{ + \tl_gset:cx{fileEmb_\file_mdfive_hash:n{\l_mix_file_tl}}{ \mix_pdflastobj: } } @@ -599,7 +579,7 @@ \cs_if_exist:cF{fileSpec_#1}{ \mix_pdfobj:nnn{}{dict}{ /Type/Filespec/F~(#1)%/UF~(#1) - /EF~<</F~\tl_use:c{fileEmb_\mix_filemdfivesum:n{\l_mix_file_tl}}>> + /EF~<</F~\tl_use:c{fileEmb_\file_mdfive_hash:n{\l_mix_file_tl}}>> } \tl_gset:cx{fileSpec_#1}{\mix_pdflastobj:} \bool_if:NT\g_mix_usrattach_bool{ @@ -1913,7 +1893,7 @@ {\g_mix_vfile_tl}{\int_use:N\l_mix_lineno_int} } \bool_set_false:N\l_mix_blankndname_bool - \mix_ndname:n{feff#1} + \mix_ndname:n{#1} }, UTFNAME .default:n = {}, diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty index 6e84cf4f913..a791da1eee8 100644 --- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty +++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty @@ -159,8 +159,8 @@ \RequirePackage{expl3} \RequirePackage{l3keys2e} -\def\g@pbs@date@tl{2019/11/04} -\def\g@pbs@version@tl{0.35} +\def\g@pbs@date@tl{2020/01/27} +\def\g@pbs@version@tl{0.36} \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} {driver independent access to low-level PDF features} @@ -171,7 +171,7 @@ Get~an~up~to~date~version~of~`#1'.\\ Aborting. } -\@ifpackagelater{expl3}{2019/05/09}{}{ +\@ifpackagelater{expl3}{2019/09/03}{}{ \msg_error:nnn{pdfbase}{support~outdated}{expl3.sty} \tex_endinput:D } @@ -434,7 +434,7 @@ \cs_new_protected_nopar:Nn\pbs_pdfximage:n{ \filename@parse{#1} - \tl_set:Nx\l_pbs_ext_tl{\tl_lower_case:n{\filename@ext}} + \tl_set:Nx\l_pbs_ext_tl{\text_lowercase:n{\filename@ext}} \bool_if:nTF{ \str_if_eq_p:Vn\l_pbs_ext_tl{png} ||\str_if_eq_p:Vn\l_pbs_ext_tl{jpg} @@ -676,7 +676,7 @@ \cs_new_protected_nopar:Nn\pbs_pdfximage:n{ \filename@parse{#1} - \tl_set:Nx\l_pbs_ext_tl{\tl_lower_case:n{\filename@ext}} + \tl_set:Nx\l_pbs_ext_tl{\text_lowercase:n{\filename@ext}} \bool_if:nTF{ \str_if_eq_p:Vn\l_pbs_ext_tl{png} ||\str_if_eq_p:Vn\l_pbs_ext_tl{jpg} @@ -768,12 +768,10 @@ \@ifclassloaded{powerdot}{\bool_gset_true:N\g_pbs_powerdot_bool}{} \sys_if_engine_pdftex:TF{ - \cs_new_nopar:Nn\pbs_filesize:n{\pdffilesize{#1}} \cs_new_nopar:Nn\pbs_filedump:nnn{\pdffiledump~offset~#1~length~#2~{#3}} }{ \sys_if_engine_luatex:T{ \RequirePackage{pdftexcmds} - \cs_new_nopar:Nn\pbs_filesize:n{\pdf@filesize{#1}} \cs_new_nopar:Nn\pbs_filedump:nnn{\pdf@filedump{#1}{#2}{#3}} } } @@ -893,7 +891,7 @@ }} {fstream}{ \tl_set:Nn\l_pbs_offset_tl{0} - \tl_set:Nx\l_pbs_fsize_tl{\pbs_filesize:n{\use_ii:nn#3}} + \tl_set:Nx\l_pbs_fsize_tl{\file_size:n{\use_ii:nn#3}} \message{<\use_ii:nn#3} %embed file in chunks of 32768 Bytes into PS as chunks of %65536 Bytes of HEX code @@ -1221,7 +1219,7 @@ \cs_new_protected_nopar:Nn\pbs_pdfximage:n{ \filename@parse{#1} - \tl_set:Nx\l_pbs_ext_tl{\tl_lower_case:n{\filename@ext}} + \tl_set:Nx\l_pbs_ext_tl{\text_lowercase:n{\filename@ext}} \bool_if:nTF{ \str_if_eq_p:Vn\l_pbs_ext_tl{ps} ||\str_if_eq_p:Vn\l_pbs_ext_tl{eps} |