media9 (9jun18)

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

7 files changed, 47 insertions, 41 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 7cd00f2fdc4..496e51f26a8 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-07
+	* v0.93 : media9.sty
+	* v0.24 : pdfbase.sty
+	* fix : pdfbase.sty: many cs now def'ed as `protected'; adjustments after
+	migration to GitLab
+
 2018-04-06
 	* v0.92 : media9.sty
 	* v0.23 : pdfbase.sty
diff --git a/Master/texmf-dist/doc/latex/media9/README b/Master/texmf-dist/doc/latex/media9/README
index 393e914a48d..488de1f2413 100644
--- a/Master/texmf-dist/doc/latex/media9/README
+++ b/Master/texmf-dist/doc/latex/media9/README
@@ -1,7 +1,7 @@
 ==================================
  The media9 LaTeX Package
 
- https://github.com/agrahn/media9
+ https://gitlab.com/agrahn/media9
 
  (C) 2012--\today Alexander Grahn
 ==================================
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 4f6f0d9d662..f673db30486 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/source/latex/media9/files/mailto.png b/Master/texmf-dist/source/latex/media9/files/mailto.png
deleted file mode 100644
index 12831c2410b..00000000000
--- a/Master/texmf-dist/source/latex/media9/files/mailto.png
+++ /dev/null
diff --git a/Master/texmf-dist/source/latex/media9/media9.tex b/Master/texmf-dist/source/latex/media9/media9.tex
index 2190bc9397f..39df290ae49 100644
--- a/Master/texmf-dist/source/latex/media9/media9.tex
+++ b/Master/texmf-dist/source/latex/media9/media9.tex
@@ -85,7 +85,7 @@
 \title{The {\sffamily media9} Package, v\g@mix@version@tl}
 \expandafter\parsedate\g@mix@date@tl\relax %set current date to package date
 \makeatother
-\author{Alexander Grahn\\[1ex]\includegraphics[height=2.7ex]{mailto}\\[1ex]\hypersetup{breaklinks=false}\url{https://github.com/agrahn/media9}\hypersetup{breaklinks=true}}
+\author{Alexander Grahn\\[1ex]\hypersetup{breaklinks=false}\url{https://gitlab.com/agrahn/media9}\hypersetup{breaklinks=true}}
 \maketitle
 
 \begin{abstract}\noindent
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 231ca6ba083..3647e7a52ff 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/04/06}
-\def\g@mix@version@tl{0.92}
+\def\g@mix@date@tl{2018/06/07}
+\def\g@mix@version@tl{0.93}
 
 \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 415a15abd56..942dee703f9 100644
--- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty
+++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty
@@ -149,8 +149,8 @@
 \RequirePackage{expl3}
 \RequirePackage{l3keys2e}
 
-\def\g@pbs@date@tl{2018/04/06}
-\def\g@pbs@version@tl{0.23}
+\def\g@pbs@date@tl{2018/06/07}
+\def\g@pbs@version@tl{0.24}
 
 \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
 {driver independent access to low-level PDF features}
@@ -183,13 +183,13 @@
 }
 
 % 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}}
+\cs_new_protected:Nn\pbs_bop_action:n{\seq_gput_right:Nn\g_pbs_bop_seq{#1}}
+\cs_new_protected: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}}
+\cs_new_protected:Nn\pbs_at_end_dvi:n{\seq_gput_right:Nn\g_pbs_eod_seq{#1}}
 \seq_new:N\g_pbs_eod_seq
 \pbs@newkey{pbs@last@page}{0}
 
@@ -205,7 +205,7 @@
     \token_to_str:N\providecommand\token_to_str:N\pbs@at@end@dvi@check{}
   }
   \iow_now:Nx\@mainaux{\token_to_str:N\pbs@at@end@dvi@check}
-  \cs_new:Npn\pbs@at@end@dvi@check{
+  \cs_new_protected:Npn\pbs@at@end@dvi@check{
     \bool_if:nT{
       !\tl_if_exist:NTF\pbs@last@page{
         \int_compare_p:n{\pbs@last@page=\g_pbs_page_int}
@@ -302,7 +302,7 @@
   \cs_new_nopar:Npn\_pbs_reftonum:w #1~0~R{#1}
 
   %literal PDF code into content stream, no saving of graphics state
-  \cs_new_nopar:Nn\pbs_literal:nn{ % #1: empty (`'), `direct' or `page'
+  \cs_new_protected_nopar:Nn\pbs_literal:nn{ % #1: empty (`'), `direct' or `page'
     \str_case:nnF{#1}{             % #2: raw PDF
       % `direct' inserts raw pdf code without translating origin (0,0) to
       % current position: origin is lower left page corner
@@ -316,7 +316,7 @@
     }
   }
 
-  \cs_new_nopar:Nn\pbs_pdfobj:nnn{
+  \cs_new_protected_nopar:Nn\pbs_pdfobj:nnn{
     \tl_clear:N\l_pbs_usenum_tl
     \tl_if_blank:oF{#1}{
       \tl_set:Nx\l_pbs_usenum_tl{useobjnum~\pbs_reftonum:n{#1}}
@@ -338,7 +338,7 @@
     \tl_gset:Nx\g_pbs_pdflastobj_tl{\the\pdflastobj\space 0~R}
   }
 
-  \cs_new_nopar:Nn\pbs_pdfannot:nnnn{
+  \cs_new_protected_nopar:Nn\pbs_pdfannot:nnnn{
     %dumb dummy Widget, workaround for AR bug;
     %see https://forums.adobe.com/message/5787612#5787612
     \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{
@@ -351,7 +351,7 @@
     \tl_gset:Nx\g_pbs_pdflastann_tl{\the\pdflastannot\space 0~R}
   }
 
-  \cs_new:Nn\pbs_pdflink:nn{
+  \cs_new_protected:Nn\pbs_pdflink:nn{
     %dumb dummy Widget, workaround for AR bug;
     %see https://forums.adobe.com/message/5787612#5787612
     \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{
@@ -363,7 +363,7 @@
       \cs_if_exist_use:N\ocgbase_insert_oc:~#1}#2\pdfendlink
   }
 
-  \cs_new_nopar:Nn\pbs_pdfxform:nnnnn{ % #1 not used
+  \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{ % #1 not used
     %additional resources
     \tl_set:Nx\l_tmpa_tl{\the\pdfpageresources~#3}\tl_trim_spaces:N\l_tmpa_tl
     %additional dict entries
@@ -376,11 +376,11 @@
     \tl_gset:Nx\g_pbs_pdflastxform_tl{\the\pdflastxform\space 0~R}
   }
 
-  \cs_new_nopar:Nn\pbs_pdfrefxform:n{% #1: xform obj ID
+  \cs_new_protected_nopar:Nn\pbs_pdfrefxform:n{% #1: xform obj ID
     \hbox_overlap_right:n{\smash{\pdfrefxform\pbs_reftonum:n{#1}}}
   }
 
-  \cs_new_nopar:Nn\pbs_pdfximage:n{
+  \cs_new_protected_nopar:Nn\pbs_pdfximage:n{
     \filename@parse{#1}
     \tl_set:Nx\l_pbs_ext_tl{\tl_lower_case:n{\filename@ext}}
     \bool_if:nTF{
@@ -399,11 +399,11 @@
     }
   }
 
-  \cs_new_nopar:Nn\pbs_pdfcatalog:n{\pdfcatalog{#1}}
+  \cs_new_protected_nopar:Nn\pbs_pdfcatalog:n{\pdfcatalog{#1}}
 
   \int_new:N\g_pbs_oc_int %object ID for marked content Properties
 
-  \cs_new_nopar:Nn\pbs_zap_properties:{ %strip /Properties dict from
+  \cs_new_protected_nopar:Nn\pbs_zap_properties:{ %strip /Properties dict from
     \group_begin:                       %/pdfpageresources
     \tl_set:Nx\l_pbs_temp_tl{\group_end:
       \global\pdfpageresources{
@@ -417,7 +417,7 @@
     }
   }
 
-  \cs_new_nopar:Nn\pbs_pdfbdc:nn{
+  \cs_new_protected_nopar:Nn\pbs_pdfbdc:nn{
     \pdfliteral~page~{#1/rm@oc\int_use:N\g_pbs_oc_int\space BDC}
     %decide whether the current property is to be written to the page
     %resources or to the xobject resources, depending on whether marked content
@@ -439,7 +439,7 @@
     \int_gincr:N\g_pbs_oc_int
   }
 
-  \cs_new_nopar:Nn\pbs_pdfemc:{\pdfliteral~page~{EMC}}
+  \cs_new_protected_nopar:Nn\pbs_pdfemc:{\pdfliteral~page~{EMC}}
 
   %inserts /Properties <<...>> entry into page resources
   \cs_gset:Nn\pbs_insert_properties_entry:{
@@ -460,7 +460,7 @@
     }
   }
 
-  \cs_new_nopar:Nn\pbs_add_form_font:{
+  \cs_new_protected_nopar:Nn\pbs_add_form_font:{
     \cs_if_exist:cF{pbs_form_font_\pdffontobjnum\font}{
       \tl_new:c{pbs_form_font_\pdffontobjnum\font}
       \tl_gput_right:Nx\g_pbs_form_fonts_tl{
@@ -483,7 +483,7 @@
     \AtBeginDocument{\special{dvipdfmx:config~g~0}}
 
     %literal PDF code into content stream; open text objects are always closed
-    \cs_new_nopar:Nn\pbs_literal:nn{ % #1: empty (`'), `direct' or `page'
+    \cs_new_protected_nopar:Nn\pbs_literal:nn{ % #1: empty (`'), `direct' or `page'
       \str_if_eq:nnTF{#1}{}{         % #2: raw PDF
         % set current location's coordinates to (0,0), while saving graphics
         % state before and re-instating after insertion (this is different from
@@ -496,7 +496,7 @@
       }
     }
 
-    \cs_new_nopar:Nn\pbs_pdfobj:nnn{
+    \cs_new_protected_nopar:Nn\pbs_pdfobj:nnn{
       \tl_if_blank:oTF{#1}{
         \tl_set:Nx\l_pbs_usenum_tl{@pbs@obj\int_use:N\g_pbs_obj_int}
         \int_gincr:N\g_pbs_obj_int
@@ -521,7 +521,7 @@
       \tl_gset_eq:NN\g_pbs_pdflastobj_tl\l_pbs_usenum_tl
     }
 
-    \cs_new_nopar:Nn\pbs_pdfannot:nnnn{
+    \cs_new_protected_nopar:Nn\pbs_pdfannot:nnnn{
       \bool_if:NTF\g_pbs_lscape_bool{
         %fix missing annotation rotation of (x)dvipdfmx on landscape pages
         \box_move_up:nn{\dim_eval:n{#2}}{\vbox:n{
@@ -557,7 +557,7 @@
       \int_gincr:N\g_pbs_obj_int
     }
 
-    \cs_new:Nn\pbs_pdflink:nn{
+    \cs_new_protected:Nn\pbs_pdflink:nn{
       %dumb dummy Widget, workaround for AR bug;
       %see https://forums.adobe.com/message/5787612#5787612
       \str_if_eq_x:nnF{\cs_if_exist_use:N\ocgbase_insert_oc:}{}{
@@ -569,7 +569,7 @@
       \special{pdf:eann}
     }
 
-    \cs_new_nopar:Nn\pbs_pdfxform:nnnnn{ % #2 not used
+    \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{ % #2 not used
       \begin{picture}(0,0)
         \put(0,0){
           \special{pdf:bxobj~@pbs@obj\int_use:N\g_pbs_obj_int\space
@@ -608,9 +608,9 @@
       \int_gincr:N\g_pbs_obj_int
     }
 
-    \cs_new_nopar:Nn\pbs_pdfrefxform:n{\special{pdf:uxobj~#1}}% #1: xform obj ID
+    \cs_new_protected_nopar:Nn\pbs_pdfrefxform:n{\special{pdf:uxobj~#1}}% #1: xform obj ID
 
-    \cs_new_nopar:Nn\pbs_pdfximage:n{
+    \cs_new_protected_nopar:Nn\pbs_pdfximage:n{
       \filename@parse{#1}
       \tl_set:Nx\l_pbs_ext_tl{\tl_lower_case:n{\filename@ext}}
       \bool_if:nTF{
@@ -630,10 +630,10 @@
       }
     }
 
-    \cs_new_nopar:Nn\pbs_pdfcatalog:n{\special{pdf:put~@catalog~<<#1>>}}
+    \cs_new_protected_nopar:Nn\pbs_pdfcatalog:n{\special{pdf:put~@catalog~<<#1>>}}
 
     \int_new:N\g_pbs_oc_int %object ID
-    \cs_new_nopar:Nn\pbs_pdfbdc:nn{
+    \cs_new_protected_nopar:Nn\pbs_pdfbdc:nn{
       \special{pdf:code~#1/rm@oc\int_use:N\g_pbs_oc_int\space BDC}
       \special{pdf:put~@resources~<<
         /Properties~<</rm@oc\int_use:N\g_pbs_oc_int\space#2>>>>}
@@ -693,7 +693,7 @@
     }
 
     %insert literal Postscript code
-    \cs_new_nopar:Nn\pbs_literal:nn{ % #1: empty (`'), `direct' or `page'
+    \cs_new_protected_nopar:Nn\pbs_literal:nn{ % #1: empty (`'), `direct' or `page'
       \str_if_eq:nnTF{#1}{}{         % #2: raw Postscript
         % set current location's coordinates to (0,0) and set unit vectors to
         % 1bp right and 1bp upwards; graphics state is saved before and
@@ -706,7 +706,7 @@
       }
     }
 
-    \cs_new_nopar:Nn\pbs_pdfobj:nnn{
+    \cs_new_protected_nopar:Nn\pbs_pdfobj:nnn{
       \tl_clear:N\l_pbs_usenum_tl
       \tl_if_blank:oTF{#1}{
         \tl_set:Nx\l_pbs_usenum_tl{{pbs@obj\int_use:N\g_pbs_obj_int}}
@@ -790,7 +790,7 @@
       \tl_gset_eq:NN\g_pbs_pdflastobj_tl\l_pbs_usenum_tl
     }
 
-    \cs_new_nopar:Nn\pbs_pdfannot:nnnn{
+    \cs_new_protected_nopar:Nn\pbs_pdfannot:nnnn{
       \group_begin:
         \dim_set:Nn\unitlength{1pt}
         \begin{picture}(0,0)% mark annotation rectangle
@@ -828,7 +828,7 @@
       }
     }
 
-    \cs_new:Nn\pbs_pdflink:nn{
+    \cs_new_protected:Nn\pbs_pdflink:nn{
       %dumb dummy Widget, workaround for AR bug;
       %see https://forums.adobe.com/message/5787612#5787612
       \pbs_pdfannot:nnnn{3pt}{3pt}{0pt}{}
@@ -853,7 +853,7 @@
       output.
     }
 
-    \cs_new_nopar:Nn\pbs_pdfxform:nnnnn{ % #1, #3 not used (resources are
+    \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{ % #1, #3 not used (resources are
       %this allows nesting \pbs_pdfxform:nnnnn{...}      %  managed by pdfmarks)
       \special{ps:
         gsave~
@@ -972,7 +972,7 @@
       }
     }
 
-    \cs_new_nopar:Nn\pbs_pdfrefxform:n{% #1: xform obj ID
+    \cs_new_protected_nopar:Nn\pbs_pdfrefxform:n{% #1: xform obj ID
       %The /SP pdfmark for placement of Form XObjects works reliably only
       %since gs-9.14. As gs-9.14 had some other TeX-related issues, we
       %require 9.15.
@@ -986,7 +986,7 @@
       }
     }
 
-    \cs_new_nopar:Nn\pbs_pdfximage:n{
+    \cs_new_protected_nopar:Nn\pbs_pdfximage:n{
       \filename@parse{#1}
       \tl_set:Nx\l_pbs_ext_tl{\tl_lower_case:n{\filename@ext}}
       \bool_if:nTF{
@@ -1011,13 +1011,13 @@
       }
     }
 
-    \cs_new_nopar:Nn\pbs_pdfcatalog:n{
+    \cs_new_protected_nopar:Nn\pbs_pdfcatalog:n{
       \special{ps:~mark~{Catalog}~<<#1>>~/PUT~pdfmark}
     }
 
     %marked content BDC/EMC operators
     %require Ghostscript v. >= 9.15
-    \cs_new_nopar:Nn\pbs_pdfbdc:nn{
+    \cs_new_protected_nopar:Nn\pbs_pdfbdc:nn{
       \special{ps:~mark~#1~#2~/BDC~pdfmark}
       \tl_if_exist:NF\g_pbs_gsoldwarned_tl{
         \tl_new:N\g_pbs_gsoldwarned_tl
@@ -1049,7 +1049,7 @@
     }
   }
 }
-\cs_new_nopar:Nn\pbs_appendtofields:n{
+\cs_new_protected_nopar:Nn\pbs_appendtofields:n{
   \tl_gput_left:Nx\g_pbs_fields_tl{#1\space}
 }