summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3experimental/l3graphics.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/l3experimental/l3graphics.dtx')
-rw-r--r--macros/latex/contrib/l3experimental/l3graphics.dtx44
1 files changed, 22 insertions, 22 deletions
diff --git a/macros/latex/contrib/l3experimental/l3graphics.dtx b/macros/latex/contrib/l3experimental/l3graphics.dtx
index 3209e4793c..0266b711fa 100644
--- a/macros/latex/contrib/l3experimental/l3graphics.dtx
+++ b/macros/latex/contrib/l3experimental/l3graphics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-05-11}
+% \date{Released 2023-10-10}
%
% \maketitle
%
@@ -184,7 +184,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesExplPackage{l3graphics}{2023-05-11}{}
+\ProvidesExplPackage{l3graphics}{2023-10-10}{}
{L3 Experimental graphics inclusion support}
% \end{macrocode}
%
@@ -236,8 +236,8 @@
pagebox .choices:nn =
{ art , bleed , crop , media , trim }
{
- \tl_set:Nx \l_@@_pagebox_tl
- { \tl_use:N \l_keys_choice_tl box }
+ \tl_set:Ne \l_@@_pagebox_tl
+ { \l_keys_choice_tl box }
} ,
pagebox .initial:n =
crop ,
@@ -267,8 +267,8 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_bb_save:n, \@@_bb_save:x}
-% \begin{macro}{\@@_bb_restore:nF, \@@_bb_restore:xF}
+% \begin{macro}{\@@_bb_save:n, \@@_bb_save:e}
+% \begin{macro}{\@@_bb_restore:nF, \@@_bb_restore:eF}
% Caching graphic bounding boxes is sensible, and these functions are needed both
% here and for drive-specific work. So they are made available as documented
% functions. To save on registers, the \enquote{origin} is only saved if it is
@@ -287,7 +287,7 @@
\dim_const:cn { c_@@_ #1 _ury_dim } { \l_@@_ury_dim }
}
}
-\cs_generate_variant:Nn \@@_bb_save:n { x }
+\cs_generate_variant:Nn \@@_bb_save:n { e }
\cs_new_protected:Npn \@@_bb_restore:nF #1#2
{
\dim_if_exist:cTF { c_@@_ #1 _urx_dim }
@@ -303,7 +303,7 @@
}
{#2}
}
-\cs_generate_variant:Nn \@@_bb_restore:nF { x }
+\cs_generate_variant:Nn \@@_bb_restore:nF { e }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -375,7 +375,7 @@
\@@_bb_restore:nF {#1#2}
{ \@@_read_bb_auxii:nnnn {#3} {#4} {#1} {#2} }
}
-\cs_new_protected:Npx \@@_read_bb_auxii:nnnn #1#2#3#4
+\cs_new_protected:Npe \@@_read_bb_auxii:nnnn #1#2#3#4
{
#1
\exp_not:N \ior_if_eof:NTF \exp_not:N \l_@@_internal_ior
@@ -390,15 +390,15 @@
}
\ior_close:N \exp_not:N \l_@@_internal_ior
}
-\use:x
+\use:e
{
\cs_new_protected:Npn \exp_not:N \@@_read_bb_auxiii:w
- ##1 \c_colon_str ##2 \s_@@_stop
+ #1 \c_colon_str #2 \s_@@_stop
{
\exp_not:N \str_if_eq:nnT
{ \c_percent_str \c_percent_str BoundingBox }
- {##1}
- { \exp_not:N \@@_read_bb_auxiv:w ##2 ( ) \s_@@_stop }
+ {#1}
+ { \exp_not:N \@@_read_bb_auxiv:w #2 ( ) \s_@@_stop }
}
}
% \end{macrocode}
@@ -413,7 +413,7 @@
{
\str_if_eq:nnF {#2} { atend }
{
- \tl_set_rescan:Nnx \l_@@_internal_tl
+ \tl_set_rescan:Nne \l_@@_internal_tl
{
\char_set_catcode_space:n { 9 }
\char_set_catcode_space:n { 32 }
@@ -552,7 +552,7 @@
\cs_if_exist:cTF { @@_backend_include_ #1 :n }
{
\tl_set_eq:NN \l_@@_final_name_str \l_@@_full_name_str
- \str_set:Nx \l_@@_full_name_str
+ \str_set:Ne \l_@@_full_name_str
{ \exp_args:NV \__kernel_file_name_quote:n \l_@@_full_name_str }
\exp_args:NnV \use:c { @@_backend_getbb_ #1 :n }
\l_@@_full_name_str
@@ -615,8 +615,8 @@
% \begin{macro}[EXP]{\@@_list_aux:n}
% A function to list all graphic files used.
% \begin{macrocode}
-\cs_new_protected:Npn \graphics_show_list: { \@@_list:N \msg_show:nnxxxx }
-\cs_new_protected:Npn \graphics_log_list: { \@@_list:N \msg_log:nnxxxx }
+\cs_new_protected:Npn \graphics_show_list: { \@@_list:N \msg_show:nneeee }
+\cs_new_protected:Npn \graphics_log_list: { \@@_list:N \msg_log:nneeee }
\cs_new_protected:Npn \@@_list:N #1
{
\seq_remove_duplicates:N \g_@@_record_seq
@@ -714,7 +714,7 @@
\exp_args:NNNV \group_end:
\tl_set:Nn #2 #2
}
-\cs_new_protected:Npx \@@_get_pagecount:n #1
+\cs_new_protected:Npe \@@_get_pagecount:n #1
{
\ior_shell_open:Nn \exp_not:N \l_@@_internal_ior
{ extractbb~-O~#1 }
@@ -731,16 +731,16 @@
}
\ior_close:N \exp_not:N \l_@@_internal_ior
}
-\use:x
+\use:e
{
\cs_new_protected:Npn \exp_not:N \@@_get_pagecount:nw
- ##1##2 \c_colon_str ##3 \c_colon_str ##4 \s_@@_stop
+ #1#2 \c_colon_str #3 \c_colon_str #4 \s_@@_stop
{
\exp_not:N \str_if_eq:nnT
{ \c_percent_str \c_percent_str Pages }
- {##2}
+ {#2}
{
- \int_const:cn { c_@@_ ##1 _pages_int } {##3}
+ \int_const:cn { c_@@_ #1 _pages_int } {#3}
\exp_not:N \ior_map_break:
}
}