texlive[43585] Master/texmf-dist: media9 (23mar17)
commits+karl at tug.org
commits+karl at tug.org
Thu Mar 23 22:28:49 CET 2017
Revision: 43585
http://tug.org/svn/texlive?view=revision&revision=43585
Author: karl
Date: 2017-03-23 22:28:49 +0100 (Thu, 23 Mar 2017)
Log Message:
-----------
media9 (23mar17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/media9/ChangeLog
trunk/Master/texmf-dist/doc/latex/media9/media9.pdf
trunk/Master/texmf-dist/tex/latex/media9/media9.sty
trunk/Master/texmf-dist/tex/latex/media9/pdfbase.sty
Modified: trunk/Master/texmf-dist/doc/latex/media9/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/doc/latex/media9/ChangeLog 2017-03-23 21:28:36 UTC (rev 43584)
+++ trunk/Master/texmf-dist/doc/latex/media9/ChangeLog 2017-03-23 21:28:49 UTC (rev 43585)
@@ -1,3 +1,8 @@
+2017-03-23
+ * v0.78 : media9.sty
+ * v0.13 : pdfbase.sty
+ * fix: ocg-related improvements
+
2017-03-16
* v0.77 : media9.sty
* v0.12 : pdfbase.sty
Modified: trunk/Master/texmf-dist/doc/latex/media9/media9.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/media9/media9.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/media9/media9.sty 2017-03-23 21:28:36 UTC (rev 43584)
+++ trunk/Master/texmf-dist/tex/latex/media9/media9.sty 2017-03-23 21:28:49 UTC (rev 43585)
@@ -39,10 +39,9 @@
\RequirePackage{l3keys2e}
\RequirePackage{xparse}
\RequirePackage{atbegshi}
-\RequirePackage{atenddvi}
-\def\g at mix@date at tl{2017/03/16}
-\def\g at mix@version at tl{0.77}
+\def\g at mix@date at tl{2017/03/23}
+\def\g at mix@version at tl{0.78}
\def\g at mix@liiikerneldate{2015/09/27}
\def\g at mix@liiipkgdate{2015/09/27}
@@ -385,7 +384,7 @@
}{
\cs_if_exist:NTF\mdfivesum{
\cs_new_nopar:Nn\mix_filemdfivesum:n{\mdfivesum file {#1}}
- }{
+ }{
\cs_new_nopar:Nn\mix_filemdfivesum:n{#1}
}
}
@@ -393,6 +392,10 @@
%creating global definitions
\cs_new:Npn\mix at newkey#1#2{\tl_gset:cx{#1}{#2}}
+\AtBeginDocument{
+ \iow_now:Nx\@mainaux{
+ \token_to_str:N\providecommand\token_to_str:N\mix at newkey[2]{}}
+}
%macros for writing global defs to \jobname.aux
\msg_set:nnn{media9}{rerun}{Rerun~to~get~internal~references~right!}
@@ -432,24 +435,6 @@
}
}
-\cs_gset_eq:NN\mix_atenddvi_checkimpl_orig:\AtEndDvi at CheckImpl%
-\def\AtEndDvi at CheckImpl{
- \mix_atenddvi_checkimpl_orig:
- \cs_if_exist:NTF\AtEndDvi at LastPage{
- \int_compare:nF{\AtEndDvi at LastPage=\value{abspage}}{
- \cs_if_exist:NF\g_mix_rerunwarned_tl{
- \tl_new:N\g_mix_rerunwarned_tl
- \msg_warning:nn{media9}{rerun}
- }
- }
- }{
- \cs_if_exist:NF\g_mix_rerunwarned_tl{
- \tl_new:N\g_mix_rerunwarned_tl
- \msg_warning:nn{media9}{rerun}
- }
- }
-}
-
%reset various variables for every new media inclusion
\cs_new:Nn\mix_reset:{
\tl_gset:Nx\g_mix_label_tl{rm@\int_use:N\g_mix_rmcnt_int}
@@ -886,7 +871,7 @@
}
\ExplSyntaxOn
-%environment for setting LTR typesetting direction with e-TeX based engines
+%environment for setting LTR typesetting direction with e-TeX based engines
\cs_new:Nn\mix_beginLTR:{
\cs_if_exist:NT\TeXXeTstate{
\int_compare:nT{\TeXXeTstate>\c_zero}{\beginL}
Modified: trunk/Master/texmf-dist/tex/latex/media9/pdfbase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/media9/pdfbase.sty 2017-03-23 21:28:36 UTC (rev 43584)
+++ trunk/Master/texmf-dist/tex/latex/media9/pdfbase.sty 2017-03-23 21:28:49 UTC (rev 43585)
@@ -107,6 +107,12 @@
% ... \pbs_pdfemc:
% #1: tag, #2: properties dictionary obj ID
%
+% --------
+%
+% alternative \AtEndDvi
+% \pbs_at_end_dvi:n
+% #1: \specials or \write to be inserted on the very last page
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% This work may be distributed and/or modified under the
@@ -123,18 +129,22 @@
\RequirePackage{expl3}
\RequirePackage{l3keys2e}
-\RequirePackage{atenddvi}
-\def\g at pbs@date at tl{2017/03/16}
-\def\g at pbs@version at tl{0.14}
+\def\g at pbs@date at tl{2017/03/23}
+\def\g at pbs@version at tl{0.15}
\ProvidesExplPackage{pdfbase}{\g at pbs@date at tl}{\g at pbs@version at tl}
{driver independent access to low-level PDF features}
-\int_new:N\g at pbs@page at int %abs. page counter (zero based)
+\int_new:N\g_pbs_page_int %abs. page counter
+%creating global definitions
+\cs_new:Npn\pbs at newkey#1#2{\tl_gset:cx{#1}{#2}}
+
+\msg_set:nnn{pdfbase}{rerun}{Rerun~to~get~internal~references~right!}
+
%LaTeX2e wrapper
-\cs_new:Npn\pbs at seq@push at cx#1#2{
+\cs_new_nopar:Npn\pbs at seq@push at cx#1#2{
\seq_if_exist:cF{#1}{\seq_new:c{#1}}
\seq_gput_right:cx{#1}{#2}
}
@@ -153,7 +163,43 @@
}
}
+% page (bop, eop) hooks
+\cs_new:Nn\pbs_bop_action:n{\seq_gput_right:Nn\g_pbs_bop_seq{#1}}
+\cs_new:Nn\pbs_eop_action:n{\seq_gput_right:Nn\g_pbs_eop_seq{#1}}
+\seq_new:N\g_pbs_bop_seq
+\seq_new:N\g_pbs_eop_seq
+
+% own AtEndDvi implementation
+\cs_new:Nn\pbs_at_end_dvi:n{\seq_gput_right:Nn\g_pbs_eod_seq{#1}}
+\seq_new:N\g_pbs_eod_seq
+\pbs at newkey{pbs at last@page}{0}
+
+% AtEndDvi check
+\AtBeginDocument{
+ \iow_now:Nx\@mainaux{
+ \token_to_str:N\providecommand\token_to_str:N\pbs at newkey[2]{}
+ \token_to_str:N\providecommand\token_to_str:N\pbs at seq@push at cx[2]{}
+ \token_to_str:N\providecommand\token_to_str:N\pbs at at@end at dvi@check{}}
+ \iow_now:Nx\@mainaux{\token_to_str:N\pbs at at@end at dvi@check}
+ \cs_new:Npn\pbs at at@end at dvi@check{
+ \bool_if:nT{
+ !\tl_if_exist:NTF\pbs at last@page{
+ \int_compare_p:n{\pbs at last@page=\g_pbs_page_int}
+ }{
+ \c_false_bool
+ }
+ }{
+ \cs_if_exist:NF\g_pbs_rerunwarned_tl{
+ \tl_new:N\g_pbs_rerunwarned_tl
+ \msg_warning:nn{pdfbase}{rerun}
+ }
+ }
+ }
+}
+
+%%%%%%%%%%%%%%%%%
%package options
+%%%%%%%%%%%%%%%%%
%unknown package option error message
\msg_gset:nnnn{pdfbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
@@ -187,9 +233,11 @@
\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}
+\cs_new_nopar:Nn\pbs_first_of_two:nn{#1} %helpers
+\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.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -274,7 +322,7 @@
\tl_gset:Nx\g_pbs_pdflastxform_tl{\the\pdflastxform\space 0~R}
}
- \cs_new:Nn\pbs_pdfrefxform:n{% #1: xform obj ID
+ \cs_new_nopar:Nn\pbs_pdfrefxform:n{% #1: xform obj ID
\hbox_overlap_right:n{\smash{\pdfrefxform\pbs_reftonum:n{#1}}}
}
@@ -331,7 +379,7 @@
\xsb_addto_props:n{/rm at oc\int_use:N\g_pbs_oc_int\space#2}
}{
\iow_shipout_x:Nx\@mainaux{\token_to_str:N\pbs at seq@push at cx{
- pbs at props@\noexpand\the\g at pbs@page at int
+ pbs at props@\exp_not:N\int_use:N\g_pbs_page_int
}{/rm at oc\int_use:N\g_pbs_oc_int\space#2}}
}
\int_gincr:N\g_pbs_oc_int
@@ -339,12 +387,11 @@
\cs_new_nopar:Nn\pbs_pdfemc:{\pdfliteral~page~{EMC}}
- %modify output routine to write /Properties<<...>> for current page
- \tl_gset:Nx\g_pbs_output_tl{\the\output}
- \global\output{
+ %inserts /Properties <<...>> entry into page resources
+ \cs_gset:Nn\pbs_insert_properties_entry:{
\pbs_zap_properties: %purge those from previous page
- \tl_set:Nx\l_tmpa_tl{\seq_if_exist:cT{pbs at props@\the\g at pbs@page at int}{
- \seq_use:cn{pbs at props@\the\g at pbs@page at int}{~}}}
+ \tl_set:Nx\l_tmpa_tl{\seq_if_exist:cT{pbs at props@\int_use:N\g_pbs_page_int}{
+ \seq_use:cn{pbs at props@\int_use:N\g_pbs_page_int}{~}}}
\tl_trim_spaces:N\l_tmpa_tl
\str_if_eq_x:nnF{\l_tmpa_tl}{}{
\group_begin:
@@ -351,15 +398,16 @@
\tl_set:Nx\l_pbs_temp_tl{\group_end:
\global\pdfpageresources{
\the\pdfpageresources
- /Properties<<\seq_if_exist:cT{pbs at props@\the\g at pbs@page at int}{
- \seq_use:cn{pbs at props@\the\g at pbs@page at int}{~}
+ /Properties<<\seq_if_exist:cT{pbs at props@\int_use:N\g_pbs_page_int}{
+ \seq_use:cn{pbs at props@\int_use:N\g_pbs_page_int}{~}
}>>
}
}\l_pbs_temp_tl
}
- \g_pbs_output_tl
- \int_gincr:N\g at pbs@page at int
- %purge from current page's properties, because they aren't needed any longer
+ }
+
+ %deletes /Properties <<...>> from page resources
+ \cs_gset:Nn\pbs_delete_properties_entry:{
\pbs_zap_properties:
}
}{
@@ -788,7 +836,7 @@
%option `-Ppdf'.
\tl_if_exist:NF\g_pbs_dpiwarned_tl{
\tl_new:N\g_pbs_dpiwarned_tl
- \AtEndDvi{\special{ps::[nobreak]\pbs_dpiwarning:}}
+ \pbs_at_end_dvi:n{\special{ps::[nobreak]\pbs_dpiwarning:}}
}
}
}
@@ -799,7 +847,7 @@
%require 9.15.
\tl_if_exist:NF\g_pbs_gsoldwarned_tl{
\tl_new:N\g_pbs_gsoldwarned_tl
- \AtEndDvi{\special{ps::[nobreak]\pbs_gsoldwarning:}}
+ \pbs_at_end_dvi:n{\special{ps::[nobreak]\pbs_gsoldwarning:}}
}
\special{ps:~
gsave~currentpoint~translate~1~\tl_use:c{scale_#1}~div~dup~scale~
@@ -842,7 +890,7 @@
\special{ps:~mark~#1~#2~/BDC~pdfmark}
\tl_if_exist:NF\g_pbs_gsoldwarned_tl{
\tl_new:N\g_pbs_gsoldwarned_tl
- \AtEndDvi{\special{ps::[nobreak]\pbs_gsoldwarning:}}
+ \pbs_at_end_dvi:n{\special{ps::[nobreak]\pbs_gsoldwarning:}}
}
}
\cs_new_nopar:Nn\pbs_pdfemc:{\special{ps:~mark~/EMC~pdfmark}}
@@ -857,7 +905,7 @@
%adding AcroForm dict to PDF Catalog
\tl_new:N\g_pbs_fields_tl %takes object IDs of Fields (aka annots with
\tl_if_exist:NF\g_pbs_acroFormAdded_tl{ % /Subtype/Widget)
- \AtEndDvi{
+ \pbs_at_end_dvi:n{
\tl_if_empty:NF\g_pbs_fields_tl{
\pbs_pdfobj:nnn{}{array}{\g_pbs_fields_tl}
\pbs_pdfcatalog:n{
@@ -870,6 +918,32 @@
\tl_gput_right:Nx\g_pbs_fields_tl{#1\space}
}
+%modify output routine for output box insertions
+\cs_set_eq:NN\pbs_outputpage_orig:\@outputpage
+\cs_set_nopar:Npn\@outputpage{
+ \int_gincr:N\g_pbs_page_int
+ \iow_now:Nx\@mainaux{
+ \token_to_str:N\pbs at newkey{pbs at 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}
+ \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
+ \int_compare:nT{\pbs at last@page=\g_pbs_page_int}{
+ \seq_map_inline:Nn\g_pbs_eod_seq{\hbox_to_zero:n{##1\hss}}
+ }
+ }
+ %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:
\char_set_catcode_active:N\+\let+\space
\cs_new_nopar:Nx\pbs_gsoldwarning:{
More information about the tex-live-commits
mailing list