From 0a4c81ff64276411d2a8308cbb0716621103237a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 25 Aug 2017 22:24:59 +0000 Subject: media9 (25aug17) git-svn-id: svn://tug.org/texlive/trunk@45129 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/media9/ChangeLog | 6 ++++++ Master/texmf-dist/doc/latex/media9/media9.pdf | Bin 3863893 -> 4544997 bytes Master/texmf-dist/source/latex/media9/media9.tex | 6 ++++-- Master/texmf-dist/tex/latex/media9/media9.sty | 4 ++-- Master/texmf-dist/tex/latex/media9/pdfbase.sty | 24 ++++++++++++++--------- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog index 7eddde58368..aab571bdabe 100644 --- a/Master/texmf-dist/doc/latex/media9/ChangeLog +++ b/Master/texmf-dist/doc/latex/media9/ChangeLog @@ -1,3 +1,9 @@ +2017-08-25 + * v0.85 : media9.sty + * v0.17 : pdfbase.sty + * fix : fixing output routine in pdfbase.sty: small vertical offset of page + content when loading package ocgx2 + 2017-08-23 * v0.84 : media9.sty * v0.16 : pdfbase.sty diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf index a08e5ad2df0..9a466bf25b0 100644 Binary files a/Master/texmf-dist/doc/latex/media9/media9.pdf and b/Master/texmf-dist/doc/latex/media9/media9.pdf differ diff --git a/Master/texmf-dist/source/latex/media9/media9.tex b/Master/texmf-dist/source/latex/media9/media9.tex index 9e4f88c82df..d2e30555825 100644 --- a/Master/texmf-dist/source/latex/media9/media9.tex +++ b/Master/texmf-dist/source/latex/media9/media9.tex @@ -106,13 +106,15 @@ Flash Player supports the efficient H.264 codec for video compression. MP4/H.264 \begin{center} \begin{Verbatim} ffmpeg -i video.avi -vf scale="trunc(iw/2)*2:trunc(ih/2)*2" - -c:v libx264 -profile:v high -pix_fmt yuv420p -g 30 -r 30 video.mp4 + -c:v libx264 -profile:v high -pix_fmt yuv420p + -g 30 -r 30 video.mp4 \end{Verbatim} \end{center} From a sequence \verb+frame-0.png+, \verb+frame-1.png+, ... of bitmap files, an MP4 video is produced by \begin{Verbatim} ffmpeg -i frame-%d.png -vf scale="trunc(iw/2)*2:trunc(ih/2)*2" - -c:v libx264 -profile:v high -pix_fmt yuv420p -g 30 -r 30 video.mp4 + -c:v libx264 -profile:v high -pix_fmt yuv420p + -g 30 -r 30 video.mp4 \end{Verbatim} Both examples insert a key frame (option `\verb+-g+') at every second since the frame rate is set to 30 fps. The video encoder requires even pixel numbers in both dimensions which is ensured by adding `\verb+-vf scale="..."+' to the option list. diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index a19139ac6e7..b4794540b8b 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{2017/08/23} -\def\g@mix@version@tl{0.84} +\def\g@mix@date@tl{2017/08/25} +\def\g@mix@version@tl{0.85} \def\g@mix@liiikerneldate{2017/05/29} \def\g@mix@liiipkgdate{2017/05/29} diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty index 201c415b8db..e3292be7f35 100644 --- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty +++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty @@ -128,8 +128,8 @@ \RequirePackage{expl3} \RequirePackage{l3keys2e} -\def\g@pbs@date@tl{2017/08/23} -\def\g@pbs@version@tl{0.16} +\def\g@pbs@date@tl{2017/08/25} +\def\g@pbs@version@tl{0.17} \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} {driver independent access to low-level PDF features} @@ -942,26 +942,32 @@ } %modify output routine for output box insertions +\bool_new:N\l_pbs_is_vertical_bool \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@newkey{pbs@last@page}{\int_use:N\g_pbs_page_int} } - \vbox_set:Nn\@outputbox{ + \box_if_vertical:cTF{@outputbox}{ + \bool_set_true:N\l_pbs_is_vertical_bool + }{ + \bool_set_false:N\l_pbs_is_vertical_bool + } + \hbox_set:Nn\@outputbox{ %begin of page - \seq_map_inline:Nn\g_pbs_bop_seq{ - \hbox_overlap_right:n{\vbox_to_zero:n{##1 \vss}}} + \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_bop_seq{##1}} \box_use_clear:N\@outputbox %end of page - \seq_map_inline:Nn\g_pbs_eop_seq{ - \hbox_overlap_right:n{\vbox_to_zero:n{\vss ##1}}} + \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eop_seq{##1}} %end of dvi \int_compare:nT{\pbs@last@page=\g_pbs_page_int}{ - \seq_map_inline:Nn\g_pbs_eod_seq{ - \hbox_overlap_right:n{\vbox_to_zero:n{\vss ##1}}} + \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eod_seq{##1}} } } + \bool_if:NT\l_pbs_is_vertical_bool{ + \vbox_set:Nn\@outputbox{\box_use_clear:N\@outputbox} + } %insert /Properties into current page's resources \pbs_insert_properties_entry: \pbs_outputpage_orig: -- cgit v1.2.3