summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/media9
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-24 22:27:10 +0000
committerKarl Berry <karl@freefriends.org>2016-03-24 22:27:10 +0000
commit44da28f97382384060ffabdefac9a7791b770f7d (patch)
treec6b0a1ea5af27d1d8ed2a6e1775111752c82196f /Master/texmf-dist/tex/latex/media9
parent0062ac57f73dc90d1b3784ab8a05a5c7c4f4d45b (diff)
media9 (22mar16)
git-svn-id: svn://tug.org/texlive/trunk@40124 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/media9')
-rw-r--r--Master/texmf-dist/tex/latex/media9/media9.sty4
-rw-r--r--Master/texmf-dist/tex/latex/media9/pdfbase.sty79
2 files changed, 40 insertions, 43 deletions
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index eef2b39b15e..d8c1b4b4d14 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{2016/03/11}
-\def\g@mix@version@tl{0.67}
+\def\g@mix@date@tl{2016/03/22}
+\def\g@mix@version@tl{0.68}
\def\g@mix@liiikerneldate{2015/09/27}
\def\g@mix@liiipkgdate{2015/09/27}
diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
index 55b559089ad..35ddc0685ca 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -57,7 +57,7 @@
% --------
%
% \pbs_appendtofields:n
-% #1 object ID of PDF annotation; annotations of /Subtype/Widget
+% #1 object ID of PDF annotation; annotations of /Subtype/Widget
% should be appended to the /Fields array of the global /AcroForm dictionary
%
% --------
@@ -120,13 +120,12 @@
% The Current Maintainer of this work is A. Grahn.
\RequirePackage{expl3}
-\RequirePackage{l3regex}
\RequirePackage{l3keys2e}
\RequirePackage{atbegshi}
\RequirePackage{atenddvi}
-\def\g@pbs@date@tl{2016/03/11}
-\def\g@pbs@version@tl{0.7}
+\def\g@pbs@date@tl{2016/03/22}
+\def\g@pbs@version@tl{0.8}
\ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
{driver independent access to low-level PDF features}
@@ -172,19 +171,19 @@
\ProcessKeysOptions{pdfbase}
\sys_if_engine_xetex:T{\bool_gset_true:N\g_pbs_dvipdfmx_bool}
+\cs_new:Nn\pbs_first_of_two:nn{#1} %helpers
+\cs_new:Nn\pbs_second_of_two:nn{#2}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%commands for creating PDF objects, annots etc.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\cs_new:Nn\pbs_first_of_two:nn{#1}
-\cs_new:Nn\pbs_second_of_two:nn{#2}
\sys_if_output_pdf:TF{
%helper func to remove `0 R' part from pdf obj reference
\cs_new_nopar:Nn\pbs_reftonum:n{\_pbs_reftonum:f{#1}}
- %
\cs_new_nopar:Nn\_pbs_reftonum:n{\exp_after:wN\_pbs_reftonum:w#1}
\cs_generate_variant:Nn\_pbs_reftonum:n{f}
\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}{
@@ -209,7 +208,7 @@
\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}
+ \tl_gset:Nx\g_pbs_pdflastann_tl{\the\pdflastannot\space 0~R}
}
\cs_new:Nn\pbs_pdflink:nn{
@@ -219,11 +218,11 @@
\cs_new_nopar:Nn\pbs_pdfxform:nnn{ % #1 not used
\int_compare:nT{#2>\c_zero}{\immediate}
\pdfxform~resources~{\the\pdfpageresources}~#3
- \tl_gset:Nx\g_pbs_pdflastxform_tl{\int_use:c{pdflastxform}~0~R}
+ \tl_gset:Nx\g_pbs_pdflastxform_tl{\the\pdflastxform\space 0~R}
}
\cs_new:Nn\pbs_pdfrefxform:n{% #1: xform obj ID
- \hbox_to_zero:n{\smash{\pdfrefxform\pbs_reftonum:n{#1}}\hss}
+ \hbox_overlap_right:n{\smash{\pdfrefxform\pbs_reftonum:n{#1}}}
}
\cs_new_nopar:Nn\pbs_pdfximage:n{
@@ -237,7 +236,7 @@
||\str_if_eq_p:Vn\l_pbs_ext_tl{jb2}
}{
\immediate\pdfximage{#1}
- \tl_gset:Nx\g_pbs_pdflastximage_tl{\int_use:c{pdflastximage}~0~R}
+ \tl_gset:Nx\g_pbs_pdflastximage_tl{\the\pdflastximage\space 0~R}
}{
\msg_error:nnnnn{pdfbase}{wrong~image~resource}{#1}{pdftex}{
png,~jpeg~and~jbig2
@@ -249,6 +248,20 @@
\int_new:N\g_pbs_oc_int %object ID for marked content Properties
+ \cs_new_nopar:Nn\pbs_zap_properties:{ %strip /Properties dict from
+ \group_begin: %/pdfpageresources
+ \tl_set:Nx\l_pbs_temp_tl{\group_end:
+ \global\pdfpageresources{
+ \exp_after:wN\_pbs_zap_properties:w\the\pdfpageresources/Properties<<>>.
+ }
+ }\l_pbs_temp_tl
+ }
+ \cs_new_nopar:Npn\_pbs_zap_properties:w#1/Properties<<#2>>#3{
+ \bool_if:nTF{\tl_if_empty_p:n{#2}&&\str_if_eq_p:nn{#3}{.}}{#1}{
+ #1\_pbs_zap_properties:w#3
+ }
+ }
+
\cs_new_nopar:Nn\pbs_pdfbdc:nn{
\pdfliteral~page~{#1/rm@oc\int_use:N\g_pbs_oc_int\space BDC}
\tl_if_empty:NTF\g_pbs_ocmap_tl{
@@ -256,35 +269,25 @@
}{
\tl_gput_right:Nx\g_pbs_ocmap_tl{~/rm@oc\int_use:N\g_pbs_oc_int\space#2}
}
- \tl_set:Nx\l_pbs_pdfpageresources_tl{\the\pdfpageresources}
- \regex_replace_all:NnN\l_pbs_regex{}\l_pbs_pdfpageresources_tl
+ \pbs_zap_properties:
\group_begin:
\tl_set:Nx\l_pbs_temp_tl{\group_end:
\global\pdfpageresources{
- \l_pbs_pdfpageresources_tl
+ \the\pdfpageresources
/Properties<<\g_pbs_ocmap_tl>>
}
}\l_pbs_temp_tl
\int_gincr:N\g_pbs_oc_int
}
\tl_new:N\g_pbs_ocmap_tl
- \regex_const:Nn\l_pbs_regex{\/Properties<<(?:\s*\/rm@oc[^R]+R\s*)+>>}
\cs_new_nopar:Nn\pbs_pdfemc:{\pdfliteral~page~{EMC}}
- %modify output routine to purge \pdfpageresources from OCG properties
+ %modify output routine to strip OCG properties from \pdfpageresources
\AtBeginShipout{\tl_gclear:N\g_pbs_ocmap_tl}
\tl_gset:Nx\g_pbs_output_tl{\the\output}
\global\output{
- \g_pbs_output_tl
- \tl_if_blank:VT\g_pbs_ocmap_tl{
- \tl_set:Nx\l_pbs_pdfpageresources_tl{\the\pdfpageresources}
- \regex_replace_all:NnN\l_pbs_regex{}\l_pbs_pdfpageresources_tl
- \group_begin:
- \tl_set:Nx\l_pbs_temp_tl{\group_end:
- \global\pdfpageresources{\l_pbs_pdfpageresources_tl}
- }\l_pbs_temp_tl
- }
+ \g_pbs_output_tl \tl_if_blank:VT\g_pbs_ocmap_tl{\pbs_zap_properties:}
}
}{
%pgf + transparency related settings
@@ -529,23 +532,17 @@
}
\cs_new_nopar:Nn\pbs_pdfannot:nnnn{
- \hbox_set:Nn\l_tmpa_box{
- \box_move_down:nn{#3}{
- \hbox_to_zero:n{
- \special{ps:~currentpoint~/pbs@lly~exch~def~/pbs@llx~exch~def}
- }
+ \group_begin:
+ \dim_set:Nn\unitlength{1pt}
+ \begin{picture}(0,0)% mark annotation rectangle
+ \put(0,-\dim_to_decimal:n{#3}){
+ \special{ps:~currentpoint~/pbs@lly~exch~def~/pbs@llx~exch~def}
}
- \skip_horizontal:n{#1}
- \box_move_up:nn{#2}{
- \hbox_to_zero:n{
- \special{ps:~currentpoint~/pbs@ury~exch~def~/pbs@urx~exch~def}
- }
+ \put(\dim_to_decimal:n{#1},\dim_to_decimal:n{#2}){
+ \special{ps:~currentpoint~/pbs@ury~exch~def~/pbs@urx~exch~def}
}
- }
- \box_set_wd:Nn\l_tmpa_box{\c_zero_dim}
- \box_set_ht:Nn\l_tmpa_box{\c_zero_dim}
- \box_set_dp:Nn\l_tmpa_box{\c_zero_dim}
- \box_use_clear:N\l_tmpa_box
+ \end{picture}
+ \group_end:
\special{ps:~
mark~
/_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}