From 769e7ba80785adf6ccb03041b687fcd0253e9371 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 14 Aug 2021 03:01:53 +0000 Subject: CTAN sync 202108140301 --- macros/latex/contrib/media9/ChangeLog | 5 + macros/latex/contrib/media9/doc/media9.pdf | Bin 3748120 -> 3748085 bytes macros/latex/contrib/media9/doc/media9.tex | 2 +- macros/latex/contrib/media9/media9.sty | 8 +- macros/latex/contrib/media9/pdfbase.sty | 178 +++++++++++++---------------- 5 files changed, 92 insertions(+), 101 deletions(-) (limited to 'macros/latex/contrib/media9') diff --git a/macros/latex/contrib/media9/ChangeLog b/macros/latex/contrib/media9/ChangeLog index 7114b7fdfd..74b9b9979e 100644 --- a/macros/latex/contrib/media9/ChangeLog +++ b/macros/latex/contrib/media9/ChangeLog @@ -1,3 +1,8 @@ +2021-08-13 + * v1.20 : media9.sty + * v0.51 : pdfbase.sty + * fix : xforms code (dvips) cleared up + 2021-07-29 * v1.19 : media9.sty * v0.50 : pdfbase.sty diff --git a/macros/latex/contrib/media9/doc/media9.pdf b/macros/latex/contrib/media9/doc/media9.pdf index 5ea35a9beb..3aa066cb7a 100644 Binary files a/macros/latex/contrib/media9/doc/media9.pdf and b/macros/latex/contrib/media9/doc/media9.pdf differ diff --git a/macros/latex/contrib/media9/doc/media9.tex b/macros/latex/contrib/media9/doc/media9.tex index af3142cdec..a7942ef584 100644 --- a/macros/latex/contrib/media9/doc/media9.tex +++ b/macros/latex/contrib/media9/doc/media9.tex @@ -785,7 +785,7 @@ parameter & description\\\hline\hline \end{figure} \begin{figure}[bp] -\savebox{\keyshift}{\keys{\shift+}}% +\savebox{\keyshift}{\keys{\shift}}% \savebox{\spacebar}{\keys{\unexpanded{\makebox[2\width][c]{Space}}}}% \centering \begin{Verbatim} diff --git a/macros/latex/contrib/media9/media9.sty b/macros/latex/contrib/media9/media9.sty index dee003d3ef..3638888bc6 100644 --- a/macros/latex/contrib/media9/media9.sty +++ b/macros/latex/contrib/media9/media9.sty @@ -41,8 +41,8 @@ \RequirePackage{l3keys2e} -\def\g@mix@date@tl{2021/07/29} -\def\g@mix@version@tl{1.19} +\def\g@mix@date@tl{2021/08/13} +\def\g@mix@version@tl{1.20} \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl} @@ -2409,8 +2409,8 @@ \RequirePackage{l3keys2e} -\def\g@mix@date@tl{2021/07/29} -\def\g@mix@version@tl{1.19} +\def\g@mix@date@tl{2021/08/13} +\def\g@mix@version@tl{1.20} \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl} diff --git a/macros/latex/contrib/media9/pdfbase.sty b/macros/latex/contrib/media9/pdfbase.sty index b61b8b56aa..56d9a0b603 100644 --- a/macros/latex/contrib/media9/pdfbase.sty +++ b/macros/latex/contrib/media9/pdfbase.sty @@ -158,8 +158,8 @@ \RequirePackage{l3keys2e} -\def\g@pbs@date@tl{2021/07/29} -\def\g@pbs@version@tl{0.50} +\def\g@pbs@date@tl{2021/08/13} +\def\g@pbs@version@tl{0.51} \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} @@ -1071,7 +1071,7 @@ output. } - \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used + \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used as \mode_leave_vertical: % resources are managed automatically %rescale box to fit within the papersize while distilling \tl_gset:cx{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}{\fp_eval:n{min(1.0, @@ -1099,66 +1099,59 @@ %additional dict entries \tl_set:Nx\l_tmpa_tl{#4} \tl_trim_spaces:N\l_tmpa_tl \pbs_special:n{ - gsave~ - currentpoint~/pbs@cury~exch~def~/pbs@curx~exch~def~ %translate graphics to upper left page corner, so we have the whole %clipbox (i. e. page area) available for distilling; outlying parts %get clipped { + gsave~currentpoint~ % put graphic's ref point coords on the stack initclip~ % restore default clipping path (page device/whole page) - clippath~pathbbox~newpath~pop~pop~ % top-left coordinates + clippath~pathbbox~newpath~pop~pop~ %page device top-left coordinates isls { landplus90 { % pkg geometry with landscape option - exch~pbs@curx~sub~\l_pbs_height_tl~add~ - exch~pbs@cury~sub + exch~\l_pbs_height_tl~add~exch }{ % landscape as class option - exch~pbs@curx~sub~\l_pbs_depth_tl~add~ - exch~pbs@cury~sub~\l_pbs_width_tl~add + exch~\l_pbs_depth_tl~add~ + exch~\l_pbs_width_tl~add } ifelse }{ % portrait - exch~pbs@curx~sub~ - exch~pbs@cury~sub~\l_pbs_depth_tl~add - } ifelse~translate - }?pdfmark~ - %move origin (0,0) to the current position - gsave~pbs@curx~pbs@cury~translate~ - %distill graphics to XObject - mark~ - /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~ - /BBox~[ % rotated BBoxes; o = reference point = origin (0,0), - isls { % x = top-left page corner, vert. coord downwards positive - landplus90 { % x----o-+ - % geometry with landscape | | | - \l_pbs_height_tl~neg~ % llx | | | - \l_pbs_width_tl~ % lly | | | - \l_pbs_depth_tl~0 % urx ury +----+-+ + \l_pbs_depth_tl~add + } ifelse~translate~ % move origin (0,0) to page location as shown + mark~ % distill graphics to XObject below + /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~ + /BBox~[ % rotated BBoxes; o = origin (0,0), x = top-left page + isls { % corner, vert. coord downwards positive + landplus90 { % x----o-+ + % geometry with landscape | | | + \l_pbs_height_tl~neg~ % llx | | | + \l_pbs_width_tl~ % lly | | | + \l_pbs_depth_tl~0 % urx ury +----+-+ + }{ + % landscape as class option x-+----+ + \l_pbs_depth_tl~neg~0~ % llx lly | | | + \l_pbs_height_tl~ % urx | | | + \l_pbs_width_tl~neg % ury | | | + } ifelse % +-o----+ }{ - % landscape as class option x-+----+ - \l_pbs_depth_tl~neg~0~ % llx lly | | | - \l_pbs_height_tl~ % urx | | | - \l_pbs_width_tl~neg % ury | | | - } ifelse % +-o----+ - }{ - % portrait x----------+ - 0~\l_pbs_height_tl~ % llx lly | | - \l_pbs_width_tl~ % urx o----------+ - \l_pbs_depth_tl~neg % ury | | - } ifelse % | | - ] % +----------+ - %insert additional dict entries (the Distiller way) - \str_if_eq:eeF{\l_tmpa_tl}{}{ - product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse~ - } - /BP~pdfmark~grestore~ - % content transformations required for appearances, cf. BBox - { % orientations above - pbs@curx~pbs@cury~2~copy~translate~1~ - -1~scale~ % upside-down (mirrored) + % portrait x----------+ + 0~\l_pbs_height_tl~ % llx lly | | + \l_pbs_width_tl~ % urx o----------+ + \l_pbs_depth_tl~neg % ury | | + } ifelse % | | + ] % +----------+ + %insert additional dict entries (the Distiller way) + \str_if_eq:eeF{\l_tmpa_tl}{}{ + product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse~ + } + /BP~pdfmark~ + % content transformations required for appearances, cf. BBox + % orientations above + 1~-1~scale~ % upside-down (mirrored) isls {90~landplus90 {neg} if~rotate} if~ % rotated - neg~exch~neg~exch~translate + %finally, move the graphic's ref point (still on the stack) to (0,0) + exch~neg~exch~neg~translate }?pdfmark } \box_set_wd:Nn#5{\c_zero_dim} @@ -1522,8 +1515,8 @@ \RequirePackage{l3keys2e} -\def\g@pbs@date@tl{2021/07/29} -\def\g@pbs@version@tl{0.50} +\def\g@pbs@date@tl{2021/08/13} +\def\g@pbs@version@tl{0.51} \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} @@ -2385,7 +2378,7 @@ output. } - \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used + \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used as \mode_leave_vertical: % resources are managed automatically %rescale box to fit within the papersize while distilling \tl_gset:cx{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}{\fp_eval:n{min(1.0, @@ -2413,66 +2406,59 @@ %additional dict entries \tl_set:Nx\l_tmpa_tl{#4} \tl_trim_spaces:N\l_tmpa_tl \pbs_special:n{ - gsave~ - currentpoint~/pbs@cury~exch~def~/pbs@curx~exch~def~ %translate graphics to upper left page corner, so we have the whole %clipbox (i. e. page area) available for distilling; outlying parts %get clipped { + gsave~currentpoint~ % put graphic's ref point coords on the stack initclip~ % restore default clipping path (page device/whole page) - clippath~pathbbox~newpath~pop~pop~ % top-left coordinates + clippath~pathbbox~newpath~pop~pop~ %page device top-left coordinates isls { landplus90 { % pkg geometry with landscape option - exch~pbs@curx~sub~\l_pbs_height_tl~add~ - exch~pbs@cury~sub + exch~\l_pbs_height_tl~add~exch }{ % landscape as class option - exch~pbs@curx~sub~\l_pbs_depth_tl~add~ - exch~pbs@cury~sub~\l_pbs_width_tl~add + exch~\l_pbs_depth_tl~add~ + exch~\l_pbs_width_tl~add } ifelse }{ % portrait - exch~pbs@curx~sub~ - exch~pbs@cury~sub~\l_pbs_depth_tl~add - } ifelse~translate - }?pdfmark~ - %move origin (0,0) to the current position - gsave~pbs@curx~pbs@cury~translate~ - %distill graphics to XObject - mark~ - /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~ - /BBox~[ % rotated BBoxes; o = reference point = origin (0,0), - isls { % x = top-left page corner, vert. coord downwards positive - landplus90 { % x----o-+ - % geometry with landscape | | | - \l_pbs_height_tl~neg~ % llx | | | - \l_pbs_width_tl~ % lly | | | - \l_pbs_depth_tl~0 % urx ury +----+-+ + \l_pbs_depth_tl~add + } ifelse~translate~ % move origin (0,0) to page location as shown + mark~ % distill graphics to XObject below + /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~ + /BBox~[ % rotated BBoxes; o = origin (0,0), x = top-left page + isls { % corner, vert. coord downwards positive + landplus90 { % x----o-+ + % geometry with landscape | | | + \l_pbs_height_tl~neg~ % llx | | | + \l_pbs_width_tl~ % lly | | | + \l_pbs_depth_tl~0 % urx ury +----+-+ + }{ + % landscape as class option x-+----+ + \l_pbs_depth_tl~neg~0~ % llx lly | | | + \l_pbs_height_tl~ % urx | | | + \l_pbs_width_tl~neg % ury | | | + } ifelse % +-o----+ }{ - % landscape as class option x-+----+ - \l_pbs_depth_tl~neg~0~ % llx lly | | | - \l_pbs_height_tl~ % urx | | | - \l_pbs_width_tl~neg % ury | | | - } ifelse % +-o----+ - }{ - % portrait x----------+ - 0~\l_pbs_height_tl~ % llx lly | | - \l_pbs_width_tl~ % urx o----------+ - \l_pbs_depth_tl~neg % ury | | - } ifelse % | | - ] % +----------+ - %insert additional dict entries (the Distiller way) - \str_if_eq:eeF{\l_tmpa_tl}{}{ - product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse~ - } - /BP~pdfmark~grestore~ - % content transformations required for appearances, cf. BBox - { % orientations above - pbs@curx~pbs@cury~2~copy~translate~1~ - -1~scale~ % upside-down (mirrored) + % portrait x----------+ + 0~\l_pbs_height_tl~ % llx lly | | + \l_pbs_width_tl~ % urx o----------+ + \l_pbs_depth_tl~neg % ury | | + } ifelse % | | + ] % +----------+ + %insert additional dict entries (the Distiller way) + \str_if_eq:eeF{\l_tmpa_tl}{}{ + product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse~ + } + /BP~pdfmark~ + % content transformations required for appearances, cf. BBox + % orientations above + 1~-1~scale~ % upside-down (mirrored) isls {90~landplus90 {neg} if~rotate} if~ % rotated - neg~exch~neg~exch~translate + %finally, move the graphic's ref point (still on the stack) to (0,0) + exch~neg~exch~neg~translate }?pdfmark } \box_set_wd:Nn#5{\c_zero_dim} -- cgit v1.2.3