media9 (28jul21)

git-svn-id: svn://tug.org/texlive/trunk@60102 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 26 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 69d95afb5e9..4c625c93041 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,8 @@
+2021-07-28
+	* v1.18 : media9.sty
+	* v0.49 : pdfbase.sty
+	* fix : default clip path for xforms with dvips
+
 2021-07-25
 	* v1.17 : media9.sty
 	* v0.48 : pdfbase.sty
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index a2c64debeda..289a322c0b0 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 6f670f770be..5196d59b4f5 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -41,8 +41,8 @@
 
 \RequirePackage{l3keys2e}
 
-\def\g@mix@date@tl{2021/07/25}
-\def\g@mix@version@tl{1.17}
+\def\g@mix@date@tl{2021/07/28}
+\def\g@mix@version@tl{1.18}
 
 \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/25}
-\def\g@mix@version@tl{1.17}
+\def\g@mix@date@tl{2021/07/28}
+\def\g@mix@version@tl{1.18}
 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
index fd21ee6c3bf..61397e2a150 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -83,8 +83,8 @@
 %   --------
 %
 %   \pbs_pdfxform:nnnnn
-%     #1: add pgf/tikz resources (transparency, shading)? (1|0) %dvipdfmx/xetex
-%     #2: (not used)
+%     #1: add pgf/tikz resources (transparency, shading)? (0|1) %dvipdfmx/xetex
+%     #2: write immediately to PDF? (0|1); eg 1 for appearances; pdftex/luatex
 %     #3: additional resources                                  %all BUT dvips
 %     #4: additional dictionary entries
 %     #5: savebox number
@@ -158,8 +158,8 @@
 
 \RequirePackage{l3keys2e}
 
-\def\g@pbs@date@tl{2021/07/25}
-\def\g@pbs@version@tl{0.48}
+\def\g@pbs@date@tl{2021/07/28}
+\def\g@pbs@version@tl{0.49}
 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
@@ -1071,8 +1071,8 @@
         output.
       }
 
-      \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used (resources
-        \mode_leave_vertical:                      % are  managed automatically)
+      \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used
+        \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,
           \dim_ratio:nn{\paperwidth}{\box_wd:N#5},
@@ -1083,7 +1083,7 @@
         }{
           \tl_use:c{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}
         }
-        %store dimensions (in "dots" units)
+        %store dimensions in "dots" units (DPI)
         \tl_set:Nx\l_pbs_width_tl{
           \dim_to_decimal:n{\box_wd:N#5}~72.27~div~Resolution~mul~}
         \tl_set:Nx\l_pbs_height_tl{
@@ -1099,7 +1099,8 @@
           %clipbox (i. e. page area) available for distilling; outlying parts
           %get clipped
           {
-            clippath~pathbbox~newpath~pop~pop~
+            initclip~ % restore default clipping path (page device/whole page)
+            clippath~pathbbox~newpath~pop~pop~ % top-left coordinates
             isls {
               landplus90 {
                 % pkg geometry with landscape option
@@ -1438,8 +1439,8 @@
 %   --------
 %
 %   \pbs_pdfxform:nnnnn
-%     #1: add pgf/tikz resources (transparency, shading)? (1|0) %dvipdfmx/xetex
-%     #2: used as PDF annotation appearance? (1|0)              %dvips/pdftex
+%     #1: add pgf/tikz resources (transparency, shading)? (0|1) %dvipdfmx/xetex
+%     #2: write immediately to PDF? (0|1); eg 1 for appearances; pdftex/luatex
 %     #3: additional resources                                  %all BUT dvips
 %     #4: additional dictionary entries
 %     #5: savebox number
@@ -1508,8 +1509,8 @@
 
 \RequirePackage{l3keys2e}
 
-\def\g@pbs@date@tl{2021/07/25}
-\def\g@pbs@version@tl{0.48}
+\def\g@pbs@date@tl{2021/07/28}
+\def\g@pbs@version@tl{0.49}
 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
@@ -2371,8 +2372,8 @@
         output.
       }
 
-      \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used (resources
-        \mode_leave_vertical:                      % are  managed automatically)
+      \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used
+        \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,
           \dim_ratio:nn{\paperwidth}{\box_wd:N#5},
@@ -2399,7 +2400,8 @@
           %clipbox (i. e. page area) available for distilling; outlying parts
           %get clipped
           {
-            clippath~pathbbox~newpath~pop~pop~
+            initclip~ % restore default clipping path (page device/whole page)
+            clippath~pathbbox~newpath~pop~pop~ % top-left coordinates
             isls {
               landplus90 {
                 % pkg geometry with landscape option