diff options
author | Karl Berry <karl@freefriends.org> | 2019-01-02 22:37:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-01-02 22:37:03 +0000 |
commit | f5eb3253503f0d9b2bb9efcf1d4813bd948ca5d4 (patch) | |
tree | f71abc91f0119ab3114800d1ac6b17b4f6bbf9a4 /Master/texmf-dist/tex | |
parent | 443bcdc0cb69f7073630ecb174d9ab71a8ec8997 (diff) |
media9 (2jan19)
git-svn-id: svn://tug.org/texlive/trunk@49577 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/media9/media9.sty | 29 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/media9/pdfbase.sty | 14 |
2 files changed, 17 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index 3647e7a52ff..f94e4e419a3 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{2018/06/07} -\def\g@mix@version@tl{0.93} +\def\g@mix@date@tl{2019/01/02} +\def\g@mix@version@tl{0.94} \def\g@mix@liiikerneldate{2017/05/29} \def\g@mix@liiipkgdate{2017/05/29} @@ -344,7 +344,7 @@ \int_new:N\l_mix_viewcnt_int %counter for 3D views per annot \int_new:N\g@mix@page@int %abs. page counter (zero based) -\int_gset:Nn\g@mix@page@int{\c_minus_one} +\int_gset:Nn\g@mix@page@int{-1} \AtBeginShipout{\int_gincr:N\g@mix@page@int} \bool_new:N\l_mix_url_bool @@ -733,15 +733,12 @@ %bit 2^2=width, 2^1=height, 2^0=totalhight given \int_case:nn{\g_mix_resizeflag_int}{ {\c_one}{ - %\hbox_set:Nn#1{\resizebox*{!}{\g_mix_tt_tl}{\box_use_clear:N#1}} \box_resize_to_ht_plus_dp:Nn#1{\g_mix_tt_tl} } {\c_two}{ - %\hbox_set:Nn#1{\resizebox{!}{\g_mix_ht_tl}{\box_use_clear:N#1}} \box_resize_to_ht:Nn#1{\g_mix_ht_tl} } {\c_four}{ - %\hbox_set:Nn#1{\resizebox{\g_mix_wd_tl}{!}{\box_use_clear:N#1}} \box_resize_to_wd:Nn#1{\g_mix_wd_tl} } {\c_five}{ @@ -752,16 +749,12 @@ \dim_set:Nn\l_tmpa_dim{\dim_abs:n{\l_tmpa_dim}} \dim_set:Nn\l_tmpb_dim{\dim_abs:n{\g_mix_tt_tl}} \dim_compare:nTF{\l_tmpa_dim<\l_tmpb_dim}{ - %\hbox_set:Nn#1{\resizebox{\g_mix_wd_tl}{!}{\box_use_clear:N#1}} \box_resize_to_wd:Nn#1{\g_mix_wd_tl} }{ - %\hbox_set:Nn#1{\resizebox*{!}{\g_mix_tt_tl}{\box_use_clear:N#1}} \box_resize_to_ht_plus_dp:Nn#1{\g_mix_tt_tl} } }{ - %\hbox_set:Nn#1{ - % \resizebox*{\g_mix_wd_tl}{\g_mix_tt_tl}{\box_use_clear:N#1}} - \box_resize:Nnn#1{\g_mix_wd_tl}{\g_mix_tt_tl} + \box_resize_to_wd_and_ht_plus_dp:Nnn#1{\g_mix_wd_tl}{\g_mix_tt_tl} } } {\c_six}{ @@ -772,15 +765,11 @@ \dim_set:Nn\l_tmpa_dim{\dim_abs:n{\l_tmpa_dim}} \dim_set:Nn\l_tmpb_dim{\dim_abs:n{\g_mix_ht_tl}} \dim_compare:nTF{\l_tmpa_dim<\l_tmpb_dim}{ - %\hbox_set:Nn#1{\resizebox{\g_mix_wd_tl}{!}{\box_use_clear:N#1}} \box_resize_to_wd:Nn#1{\g_mix_wd_tl} }{ - %\hbox_set:Nn#1{\resizebox{!}{\g_mix_ht_tl}{\box_use_clear:N#1}} \box_resize_to_ht:Nn#1{\g_mix_ht_tl} } }{ - %\hbox_set:Nn#1{ - % \resizebox{\g_mix_wd_tl}{\g_mix_ht_tl}{\box_use_clear:N#1}} \box_resize_to_wd_and_ht:Nnn#1{\g_mix_wd_tl}{\g_mix_ht_tl} } } @@ -801,7 +790,10 @@ \bool_new:N\g_mix_iiid_bool \int_new:N\l_mix_lineno_int -\NewDocumentCommand\addmediapath{m}{\file_path_include:n{#1/}} +\NewDocumentCommand\addmediapath{m}{ + \str_set:Nn \l_tmpa_str {#1/} + \seq_put_right:NV \l_file_search_path_seq \l_tmpa_str +} %play button overlay; two versions: fancy and plain \box_new:N\l_mix_pbtn_box @@ -980,7 +972,7 @@ } %create 3D views from file (option 3Dviews) \bool_if:nT{\g_mix_iiid_bool && !(\tl_if_blank_p:V\g_mix_vfile_tl)}{ - \tl_set:Nn\l_mix_level_tl{\c_minus_one} + \tl_set:Nn\l_mix_level_tl{-1} \int_zero:N\l_mix_viewcnt_int \int_zero:N\l_mix_lineno_int @@ -2105,7 +2097,7 @@ } \mix_view:n{\l_mix_xname_tl} \tl_put_right:Nx\l_mix_iiidviewarray_tl{~\mix_pdflastobj:} - \tl_set:Nn\l_mix_level_tl{\c_minus_one} + \tl_set:Nn\l_mix_level_tl{-1} } {1}{ %PART @@ -2418,4 +2410,3 @@ } \tl_set_eq:NN\l_mix_mediabutton_tl\mediabutton \tl_set:Nn\mediabutton{\mix_uribegin:\l_mix_mediabutton_tl} - diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty index 942dee703f9..093008e5d2d 100644 --- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty +++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty @@ -98,7 +98,7 @@ % -------- % % \pbs_literal:nn -% #1: keyword (empty) | direct | page +% #1: keyword (empty) | direct | page % #2: raw PDF/Postscript code % implements \pdfliteral{...}, \pdfliteral direct {...}, % \pdfliteral page {...} from pdfTeX, and @@ -149,8 +149,8 @@ \RequirePackage{expl3} \RequirePackage{l3keys2e} -\def\g@pbs@date@tl{2018/06/07} -\def\g@pbs@version@tl{0.24} +\def\g@pbs@date@tl{2019/01/02} +\def\g@pbs@version@tl{0.25} \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} {driver independent access to low-level PDF features} @@ -842,7 +842,7 @@ \dim_use:N\box_ht:N\l_tmpb_box}{ \dim_use:N\box_dp:N\l_tmpb_box }{#1} - \box_use_clear:N\l_tmpb_box + \box_use_drop:N\l_tmpb_box } } @@ -950,7 +950,7 @@ pop~pop~pop~ mark~{pbs@obj\int_use:N\g_pbs_obj_int}~<<\l_tmpa_tl>>~/PUT~pdfmark }{pop}ifelse - } + } } \tl_gset:Nx\g_pbs_pdflastxform_tl{{pbs@obj\int_use:N\g_pbs_obj_int}} \int_gincr:N\g_pbs_obj_int @@ -1069,12 +1069,12 @@ \hbox_set:Nn\@outputbox{ %begin of page \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_bop_seq{##1}} - \box_use_clear:N\@outputbox + \box_use_drop:N\@outputbox %end of page \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eop_seq{##1}} } \bool_if:NT\l_pbs_is_vertical_bool{ - \vbox_set:Nn\@outputbox{\box_use_clear:N\@outputbox} + \vbox_set:Nn\@outputbox{\box_use_drop:N\@outputbox} } \pbs_outputpage_orig: } |