summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-26 22:30:17 +0000
committerKarl Berry <karl@freefriends.org>2015-11-26 22:30:17 +0000
commite17b5de3039e7ff6bc1ff3f6a4335a58c3b2c444 (patch)
treebdba15bc355d49b537bd2b3d964b512985ccd22a
parentacade44f8559bd44504dc0d9680f32375ab05a97 (diff)
media9 (26nov15)
git-svn-id: svn://tug.org/texlive/trunk@38951 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/media9/ChangeLog3
-rw-r--r--Master/texmf-dist/doc/latex/media9/media9.pdfbin3606000 -> 3606676 bytes
-rw-r--r--Master/texmf-dist/tex/latex/media9/media9.sty22
-rw-r--r--Master/texmf-dist/tex/latex/media9/pdfbase.sty64
4 files changed, 46 insertions, 43 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 1e85adaff18..0e481a7f2d1 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,6 @@
+2015-11-26
+ * v0.61 : media9.sty, with minor fixes
+
2015-11-23
* v0.3 : pdfbase.sty, with minor fixes
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 2bcb52d44e6..7b1ef0d8622 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index e8dd365c796..9d8480c2007 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -41,8 +41,8 @@
\RequirePackage{atbegshi}
\RequirePackage{atenddvi}
-\def\g@mix@date@tl{2015/11/23}
-\def\g@mix@version@tl{0.60}
+\def\g@mix@date@tl{2015/11/26}
+\def\g@mix@version@tl{0.61}
\def\g@mix@liiikerneldate{2015/09/27}
\def\g@mix@liiipkgdate{2015/09/27}
@@ -320,12 +320,12 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{pdfbase}
%aliases for commands from pdfbase.sty
-\cs_new_eq:NN\mix_pdfobj:nnn \pbs_pdfobj:nnn
-\cs_new_eq:NN\mix_pdfannot:nnnn\pbs_pdfannot:nnnn
-\cs_new_eq:NN\mix_pdflink:nn \pbs_pdflink:nn
-\cs_new_eq:NN\mix_pdfxform:n \pbs_pdfxform:n
-\cs_new_eq:NN\mix_pdfximage:n \pbs_pdfximage:n
-\cs_new_eq:NN\mix_pdfcatalog:n \pbs_pdfcatalog:n
+\cs_set_eq:NN\mix_pdfobj:nnn \pbs_pdfobj:nnn
+\cs_set_eq:NN\mix_pdfannot:nnnn\pbs_pdfannot:nnnn
+\cs_set_eq:NN\mix_pdflink:nn \pbs_pdflink:nn
+\cs_set_eq:NN\mix_pdfxform:n \pbs_pdfxform:n
+\cs_set_eq:NN\mix_pdfximage:n \pbs_pdfximage:n
+\cs_set_eq:NN\mix_pdfcatalog:n \pbs_pdfcatalog:n
\cs_set_eq:NN\mix_pdflastobj: \pbs_pdflastobj:
\cs_set_eq:NN\mix_pdflastann: \pbs_pdflastann:
@@ -396,7 +396,7 @@
}
\msg_set:nnn{media9}{multiple~labels}{There~were~multiply-defined~labels!}
-\cs_gset:Nn\mix_keytoaux_now:nn{
+\cs_new_nopar:Nn\mix_keytoaux_now:nn{
\iow_now:Nx\@mainaux{\token_to_str:N\mix@newkey{#1}{#2}}
\bool_if:nT{
% !\cs_if_exist_p:c{#1} || !\str_if_eq_x_p:nn{\tl_use:c{#1}}{#2}
@@ -412,7 +412,7 @@
}
}
}
-\cs_gset:Nn\mix_keytoaux_shipout:nn{
+\cs_new_nopar:Nn\mix_keytoaux_shipout:nn{
\iow_shipout_x:Nx\@mainaux{\token_to_str:N\mix@newkey{#1}{#2}}
\cs_if_exist:cF{#1}{
\cs_if_exist:NF\g_mix_rerunwarned_tl{
@@ -557,7 +557,7 @@
}
\cs_new:Nn\mix_insert_btnocg:{%OCG for play button overlay
- \ocgbase_new_ocg:xxx{MediaPlayButton\int_use:N\g_mix_rmcnt_int}{
+ \ocgbase_new_ocg:nnn{MediaPlayButton\int_use:N\g_mix_rmcnt_int}{
/Print<</PrintState/OFF>>/Export<</ExportState/OFF>>
}{off}
\tl_gset:Nx\g_mix_btnocg_tl{\ocgbase_last_ocg:}
diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
index cc8bc873bd9..52d19240016 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -154,8 +154,8 @@
%commands for creating PDF objects, annots etc.
\sys_if_output_pdf:TF{
%helper func to remove `0 R' part from pdf obj reference
- \cs_new:Npn\pbs_reftonum:w #1~0~R {#1}
- \cs_new:Nn\pbs_pdfobj:nnn{
+ \cs_new_nopar:Npn\pbs_reftonum:w #1~0~R {#1}
+ \cs_new_nopar:Nn\pbs_pdfobj:nnn{
\tl_clear:N\l_pbs_usenum_tl
\tl_if_blank:oF{#1}{
\tl_set:Nx\l_pbs_usenum_tl{useobjnum~\exp_after:wN \pbs_reftonum:w #1}
@@ -173,7 +173,7 @@
\tl_gset:Nx\g_pbs_pdflastobj_tl{\the\pdflastobj\space 0~R}
}
- \cs_new:Nn\pbs_pdfannot:nnnn{
+ \cs_new_nopar:Nn\pbs_pdfannot:nnnn{
\immediate\pdfannot~width~#1~height~#2~depth~#3 {#4}
\tl_gset:Nx\g_pbs_pdflastann_tl{\int_use:c{pdflastannot}~0~R}
}
@@ -182,12 +182,12 @@
\immediate\pdfstartlink~user~{#1}#2\pdfendlink
}
- \cs_new:Nn\pbs_pdfxform:n{
+ \cs_new_nopar:Nn\pbs_pdfxform:n{
\immediate\pdfxform~resources~{\the\pdfpageresources}~#1
\tl_gset:Nx\g_pbs_pdflastxform_tl{\int_use:c{pdflastxform}~0~R}
}
- \cs_new:Nn\pbs_pdfximage:n{
+ \cs_new_nopar:Nn\pbs_pdfximage:n{
\filename@parse{#1}
\tl_set:Nx\l_pbs_ext_tl{\tl_lower_case:n{\filename@ext}}
\bool_if:nTF{
@@ -206,11 +206,11 @@
}
}
- \cs_new:Nn\pbs_pdfcatalog:n{\pdfcatalog{#1}}
+ \cs_new_nopar:Nn\pbs_pdfcatalog:n{\pdfcatalog{#1}}
\int_new:N\g_pbs_oc_int % object ID for marked content Properties
- \cs_new:Nn\pbs_pdfbdc:nn{
+ \cs_new_nopar:Nn\pbs_pdfbdc:nn{
\immediate\pdfliteral~direct~{#1/rm@oc\int_use:N\g_pbs_oc_int\space BDC}
\tl_if_empty:NTF\g_pbs_ocmap_tl{
\tl_gset:Nx\g_pbs_ocmap_tl{/rm@oc\int_use:N\g_pbs_oc_int\space#2}
@@ -231,7 +231,7 @@
\tl_new:N\g_pbs_ocmap_tl
\regex_const:Nn\l_pbs_regex{\/Properties<<(?:\s*\/rm@oc[^R]+R\s*)+>>}
- \cs_new:Nn\pbs_pdfemc:{\immediate\pdfliteral~direct~{EMC}}
+ \cs_new_nopar:Nn\pbs_pdfemc:{\immediate\pdfliteral~direct~{EMC}}
%modify output routine to purge \pdfpageresources from OCG properties
\AtBeginShipout{\tl_gclear:N\g_pbs_ocmap_tl}
@@ -256,7 +256,7 @@
}
\int_new:N\g_pbs_obj_int % object ID
\bool_if:NTF\g_pbs_dvipdfmx_bool{ %dvipdfmx/XeTeX
- \cs_new:Nn\pbs_pdfobj:nnn{
+ \cs_new_nopar:Nn\pbs_pdfobj:nnn{
\tl_if_blank:oTF{#1}{
\tl_set:Nx\l_pbs_usenum_tl{@pbs@obj\int_use:N\g_pbs_obj_int}
\int_gincr:N\g_pbs_obj_int
@@ -277,7 +277,7 @@
\tl_gset_eq:NN\g_pbs_pdflastobj_tl\l_pbs_usenum_tl
}
- \cs_new:Nn\pbs_pdfannot:nnnn{
+ \cs_new_nopar:Nn\pbs_pdfannot:nnnn{
\special{pdf:ann~@pbs@obj\int_use:N\g_pbs_obj_int\space
width~#1\space
height~#2\space
@@ -291,7 +291,7 @@
\special{pdf:bann~<<#1>>}#2\special{pdf:eann}
}
- \cs_new:Nn\pbs_pdfxform:n{
+ \cs_new_nopar:Nn\pbs_pdfxform:n{
\special{pdf:bxobj~@pbs@obj\int_use:N\g_pbs_obj_int\space
width\space \dim_use:N\box_wd:N#1\space
height\space\dim_use:N\box_ht:N#1\space
@@ -318,7 +318,7 @@
\int_gincr:N\g_pbs_obj_int
}
- \cs_new:Nn\pbs_pdfximage:n{
+ \cs_new_nopar:Nn\pbs_pdfximage:n{
\filename@parse{#1}
\tl_set:Nx\l_pbs_ext_tl{\tl_lower_case:n{\filename@ext}}
\bool_if:nTF{
@@ -338,29 +338,29 @@
}
}
- \cs_new:Nn\pbs_pdfcatalog:n{\special{pdf:put~@catalog~<<#1>>}}
+ \cs_new_nopar:Nn\pbs_pdfcatalog:n{\special{pdf:put~@catalog~<<#1>>}}
\int_new:N\g_pbs_oc_int % object ID
- \cs_new:Nn\pbs_pdfbdc:nn{
+ \cs_new_nopar:Nn\pbs_pdfbdc:nn{
\special{pdf:code~#1/rm@oc\int_use:N\g_pbs_oc_int\space BDC}
\special{pdf:put~@resources~<<
/Properties~<</rm@oc\int_use:N\g_pbs_oc_int\space#2>>>>}
\int_gincr:N\g_pbs_oc_int
}
- \cs_new:Nn\pbs_pdfemc:{\special{pdf:~code~EMC}}
+ \cs_new_nopar:Nn\pbs_pdfemc:{\special{pdf:~code~EMC}}
}{
% dvips
\bool_new:N\g_pbs_powerdot_bool %to cope with some powerdot oddity
\@ifclassloaded{powerdot}{\bool_gset_true:N\g_pbs_powerdot_bool}{}
\sys_if_engine_pdftex:TF{
- \cs_new:Nn\pbs_filesize:n{\pdffilesize{#1}}
- \cs_new:Nn\pbs_filedump:nnn{\pdffiledump~offset~#1~length~#2~{#3}}
+ \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:Nn\pbs_filesize:n{\pdf@filesize{#1}}
- \cs_new:Nn\pbs_filedump:nnn{\pdf@filedump{#1}{#2}{#3}}
+ \cs_new_nopar:Nn\pbs_filesize:n{\pdf@filesize{#1}}
+ \cs_new_nopar:Nn\pbs_filedump:nnn{\pdf@filedump{#1}{#2}{#3}}
}
}
@@ -393,7 +393,7 @@
}
}
- \cs_new:Nn\pbs_pdfobj:nnn{
+ \cs_new_nopar:Nn\pbs_pdfobj:nnn{
\tl_clear:N\l_pbs_usenum_tl
\tl_if_blank:oTF{#1}{
\tl_set:Nx\l_pbs_usenum_tl{{pbs@obj\int_use:N\g_pbs_obj_int}}
@@ -468,7 +468,7 @@
\tl_gset_eq:NN\g_pbs_pdflastobj_tl\l_pbs_usenum_tl
}
- \cs_new:Nn\pbs_pdfannot:nnnn{
+ \cs_new_nopar:Nn\pbs_pdfannot:nnnn{
\hbox_set:Nn\l_tmpa_box{
\box_move_down:nn{#3}{
\hbox_to_zero:n{
@@ -511,7 +511,7 @@
}
}
- \cs_new:Nn\pbs_pdfxform:n{
+ \cs_new_nopar:Nn\pbs_pdfxform:n{
%mark bbox of box#1
\hbox_set:Nn\l_tmpa_box{
\box_move_down:nn{\box_dp:N #1}{
@@ -587,7 +587,7 @@
\int_gincr:N\g_pbs_obj_int
}
- \cs_new:Nn\pbs_pdfximage:n{
+ \cs_new_nopar:Nn\pbs_pdfximage:n{
\filename@parse{#1}
\tl_set:Nx\l_pbs_ext_tl{\tl_lower_case:n{\filename@ext}}
\bool_if:nTF{
@@ -612,30 +612,30 @@
}
}
- \cs_new:Nn\pbs_pdfcatalog:n{
+ \cs_new_nopar:Nn\pbs_pdfcatalog:n{
\special{ps:~mark~{Catalog}~<<#1>>~/PUT~pdfmark}
}
%marked content BDC/EMC operators
%require Ghostscript v. >= 9.15
- \cs_new:Nn\pbs_pdfbdc:nn{
- \cs_if_exist:NF\g_pbs_gsoldwarned_tl{
+ \cs_new_nopar:Nn\pbs_pdfbdc:nn{
+ \tl_if_exist:NF\g_pbs_gsoldwarned_tl{
\tl_new:N\g_pbs_gsoldwarned_tl
\AtEndDvi{\special{ps::[nobreak]\pbs_gsoldwarning:}}
}
\special{ps:~mark~#1~#2~/BDC~pdfmark}
}
- \cs_new:Nn\pbs_pdfemc:{\special{ps:~mark~/EMC~pdfmark}}
+ \cs_new_nopar:Nn\pbs_pdfemc:{\special{ps:~mark~/EMC~pdfmark}}
}
}
-\cs_new:Nn\pbs_pdflastobj:{\g_pbs_pdflastobj_tl}
-\cs_new:Nn\pbs_pdflastann:{\g_pbs_pdflastann_tl}
-\cs_new:Nn\pbs_pdflastxform:{\g_pbs_pdflastxform_tl}
-\cs_new:Nn\pbs_pdflastximage:{\g_pbs_pdflastximage_tl}
+\cs_new_nopar:Nn\pbs_pdflastobj:{\g_pbs_pdflastobj_tl}
+\cs_new_nopar:Nn\pbs_pdflastann:{\g_pbs_pdflastann_tl}
+\cs_new_nopar:Nn\pbs_pdflastxform:{\g_pbs_pdflastxform_tl}
+\cs_new_nopar:Nn\pbs_pdflastximage:{\g_pbs_pdflastximage_tl}
\group_begin:
\char_set_catcode_active:N\+\let+\space
-\cs_new:Nx\pbs_gsoldwarning:{
+\cs_new_nopar:Nx\pbs_gsoldwarning:{
{product~(Ghostscript)~search~{pop~pop~pop~true}{pop~false}ifelse~
revision~915~lt~and~{
(\token_to_str:N\n