xsavebox (9jun18)

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

1 files changed, 14 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/xsavebox/xsavebox.sty b/Master/texmf-dist/tex/latex/xsavebox/xsavebox.sty
index 124c4c0df26..0e001c446b4 100644
--- a/Master/texmf-dist/tex/latex/xsavebox/xsavebox.sty
+++ b/Master/texmf-dist/tex/latex/xsavebox/xsavebox.sty
@@ -49,8 +49,8 @@
 \RequirePackage{pdfbase} %everything with `pbs_' prefix
 \RequirePackage{l3keys2e}
 
-\def\g@xsb@version@tl{0.10}
-\def\g@xsb@date@tl{2018/03/29}
+\def\g@xsb@version@tl{0.11}
+\def\g@xsb@date@tl{2018/06/07}
 \ProvidesExplPackage{xsavebox}{\g@xsb@date@tl}{\g@xsb@version@tl}
 {saveboxes for repeating content without code replication}
 
@@ -67,7 +67,7 @@
 
 %re-run message
 \msg_set:nnn{xsavebox}{rerun}{Rerun~to~get~internal~references~right!}
-\cs_new:Nn\xsb_rerun_msg:{
+\cs_new_protected:Nn\xsb_rerun_msg:{
   \cs_if_exist:NF\g_xsb_rerunwarned_tl{
     \tl_new:N\g_xsb_rerunwarned_tl
     \AtEndDocument{\msg_warning:nn{xsavebox}{rerun}}
@@ -197,7 +197,7 @@
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\cs_new_nopar:Nn\xsb_xlrbox:{
+\cs_new_protected:Nn\xsb_xlrbox:{
   \group_begin:
   \xsb_push_props: %new, empty properties dict
   \xsb_beginLTR:
@@ -205,7 +205,7 @@
   \ignorespaces
 }
 
-\cs_new_nopar:Nn\xsb_endxlrbox:n{
+\cs_new_protected_nopar:Nn\xsb_endxlrbox:n{
   \unskip
   \group_end:\hbox_set_end:
   \sbox\l_xsb_box{\hbox_unpack_clear:N\l_xsb_box}
@@ -214,7 +214,7 @@
   \group_end:
 }
 
-\cs_new_nopar:Nn\xsb_xlrbox_star:{
+\cs_new_protected:Nn\xsb_xlrbox_star:{
   \group_begin:
   \xsb_push_props: %new, empty properties dict
   \xsb_beginLTR:
@@ -222,7 +222,7 @@
   \ignorespaces
 }
 
-\cs_new_nopar:Nn\xsb_endxlrbox_star:n{
+\cs_new_protected_nopar:Nn\xsb_endxlrbox_star:n{
   \unskip
   \color@endgroup\hbox_set_end:
   \xsb_process_box:nnnN{#1}{\width}{c}\l_xsb_box
@@ -230,7 +230,7 @@
   \group_end:
 }
 
-\cs_new_nopar:Nn\xsb_process_box:nnnN{
+\cs_new_protected_nopar:Nn\xsb_process_box:nnnN{
   %measure natural dimensions
   \cs_set_nopar:Npn\width {\box_wd:N#4}
   \cs_set_nopar:Npn\height{\box_ht:N#4}
@@ -264,7 +264,7 @@
     \token_to_str:N\pbs@newkey{xsb@\int_use:N\g_xsb_id_int}{false}
   }
   %define command for inserting the m-boxed XObject reference
-  \tl_gset:cx{the#1}{
+  \cs_gset_protected:cpx{the#1}{
     \exp_not:N\tl_if_exist:cF{xsb_\int_use:N\g_xsb_id_int}{
       %mark box as `used'
       \exp_not:N\iow_now:Nx\@mainaux{
@@ -296,12 +296,12 @@
 \box_new:N\l_xsb_raw_box %for saving the raw content
 
 %environment for setting LTR typesetting direction with e-TeX based engines
-\cs_new:Nn\xsb_beginLTR:{
+\cs_new_protected:Nn\xsb_beginLTR:{
   \cs_if_exist:NT\TeXXeTstate{
     \int_compare:nT{\TeXXeTstate>\c_zero}{\beginL}
   }
 }
-\cs_new:Nn\xsb_endLTR:{
+\cs_new_protected:Nn\xsb_endLTR:{
   \cs_if_exist:NT\TeXXeTstate{
     \int_compare:nT{\TeXXeTstate>\c_zero}{\endL}
   }
@@ -315,11 +315,11 @@
 \seq_new:N\g_xsb_props_seq
 
 %push new, empty properties dictionary on the stack (to be used by THIS pkg)
-\cs_new:Nn\xsb_push_props:{\seq_gpush:Nn\g_xsb_props_seq{}}
+\cs_new_protected:Nn\xsb_push_props:{\seq_gpush:Nn\g_xsb_props_seq{}}
 
 %pop current properties dict from stack and place its contents as a
 %/Properties << <prop dict> >> entry into the macro argument
-\cs_new:Nn\xsb_pop_props_to:N{
+\cs_new_protected:Nn\xsb_pop_props_to:N{
   \seq_gpop:NNT\g_xsb_props_seq\l_tmpa_tl{
     \tl_trim_spaces:N\l_tmpa_tl
     \str_if_eq_x:nnF{\l_tmpa_tl}{}{\tl_set:Nx#1{/Properties<<\l_tmpa_tl>>}}
@@ -328,7 +328,7 @@
 
 %add property (usually /key/val entry) to current properties dict;
 %this command is meant to be used by OTHER packages
-\cs_new:Nn\xsb_addto_props:n{
+\cs_new_protected:Nn\xsb_addto_props:n{
   \seq_gpop:NNT\g_xsb_props_seq\l_tmpa_tl{
     \tl_put_right:Nn\l_tmpa_tl{#1~}
     \seq_gpush:Nx\g_xsb_props_seq{\l_tmpa_tl}