[latex3-commits] [latex3/latex2e] latexlab/uf-review-03: switch to e-type (c84d8e1a)
github at latex-project.org
github at latex-project.org
Sun Oct 29 12:08:11 CET 2023
Repository : https://github.com/latex3/latex2e
On branch : latexlab/uf-review-03
Link : https://github.com/latex3/latex2e/commit/c84d8e1a8b3c534d218e0be9797dcbf9841cf56b
>---------------------------------------------------------------
commit c84d8e1a8b3c534d218e0be9797dcbf9841cf56b
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Sun Oct 29 12:08:11 2023 +0100
switch to e-type
>---------------------------------------------------------------
c84d8e1a8b3c534d218e0be9797dcbf9841cf56b
required/latex-lab/latex-lab-block.dtx | 2 +-
required/latex-lab/latex-lab-footnotes.dtx | 12 +++----
required/latex-lab/latex-lab-graphic.dtx | 56 +++++++++++++++---------------
3 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/required/latex-lab/latex-lab-block.dtx b/required/latex-lab/latex-lab-block.dtx
index 3bd06b72..e0a723ca 100644
--- a/required/latex-lab/latex-lab-block.dtx
+++ b/required/latex-lab/latex-lab-block.dtx
@@ -2314,7 +2314,7 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{macro}{\@@_make_label_box:n, \@@_label_format:x}
+% \begin{macro}{\@@_make_label_box:n, \@@_label_format:e}
% Make one label, wrapped in \cs{@@_label_format:n}, with an
% appropriate \tn{strut} and possibly \tn{makelabel} in compatibility
% mode (used for the \env{list} environment).
diff --git a/required/latex-lab/latex-lab-footnotes.dtx b/required/latex-lab/latex-lab-footnotes.dtx
index 2cbb3b94..252f4bc7 100644
--- a/required/latex-lab/latex-lab-footnotes.dtx
+++ b/required/latex-lab/latex-lab-footnotes.dtx
@@ -899,7 +899,7 @@
% \subsection{Variants}
%
% \begin{macrocode}
-\cs_generate_variant:Nn \prop_gput:Nnn {cxn}
+\cs_generate_variant:Nn \prop_gput:Nnn {cen}
\cs_generate_variant:Nn \hook_gput_code:nnn{nne}
\cs_generate_variant:Nn \tag_struct_use:n {e}
% \end{macrocode}
@@ -1727,7 +1727,7 @@
{
\cs_set_protected:Npn \@@_label_hook:e #1
{
- \property_record:xx {@@/#1} {fnote/struct}
+ \property_record:ee {@@/#1} {fnote/struct}
}
}
% \end{macrocode}
@@ -1765,7 +1765,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \fnote_mark_gput:nn #1 #2 % #1 the representation of the mark, #2 type
{
- \prop_gput:cxn { g_@@_currentmarks_ #2 _prop }
+ \prop_gput:cen { g_@@_currentmarks_ #2 _prop }
{ \tag_get:n{struct_num} }
{ #1 }
}
@@ -1838,7 +1838,7 @@
% which means the name of the prop shouldn't be fix.
% \begin{macrocode}
\fnote_mark_gput:oo {\@thefnmark}{\l_fnote_type_tl}
- \tl_set:Nx \l_@@_linktarget_tl {footnote*.\tag_get:n{struct_num}}
+ \tl_set:Ne \l_@@_linktarget_tl {footnote*.\tag_get:n{struct_num}}
}
% \end{macrocode}
% If there is no autodetecting we need some id,
@@ -1859,7 +1859,7 @@
% in this case we set the name of the linktarget in the note
% to the structure number of the text mark.
% \begin{macrocode}
- \tl_set:Nx \l_@@_linktarget_tl {footnote*.\property_ref:ee {@@/\l_@@_currentlabel_tl} {fnote/struct}}
+ \tl_set:Ne \l_@@_linktarget_tl {footnote*.\property_ref:ee {@@/\l_@@_currentlabel_tl} {fnote/struct}}
}
% \end{macrocode}
% And now the actual content
@@ -1937,7 +1937,7 @@
% \end{macrocode}
% Store the current structure number for labels.
% \begin{macrocode}
- \tl_set:Nx \l_@@_currentstruct_tl { \tag_get:n{struct_num} }
+ \tl_set:Ne \l_@@_currentstruct_tl { \tag_get:n{struct_num} }
% \end{macrocode}
% We want to move the label structure here. So we provide a container
% It number is |\l__fnote_currentstruct_tl| plus 1.
diff --git a/required/latex-lab/latex-lab-graphic.dtx b/required/latex-lab/latex-lab-graphic.dtx
index b8153fba..a210adf1 100644
--- a/required/latex-lab/latex-lab-graphic.dtx
+++ b/required/latex-lab/latex-lab-graphic.dtx
@@ -342,8 +342,8 @@
{
\tl_if_empty:NT\l_@@_graphic_alt_tl
{
- \msg_warning:nnx{tag}{alt-text-missing}{\l_@@_graphic_alt_dflt_tl}
- \tl_set:Nx\l_@@_graphic_alt_tl {\l_@@_graphic_alt_dflt_tl}
+ \msg_warning:nne{tag}{alt-text-missing}{\l_@@_graphic_alt_dflt_tl}
+ \tl_set:Ne\l_@@_graphic_alt_tl {\l_@@_graphic_alt_dflt_tl}
}
\tag_struct_begin:n
{
@@ -459,7 +459,7 @@
% \begin{macrocode}
\AddToHook{package/graphicx/after}[latex-lab]
{
- \define at key{Gin}{alt} {\tl_set:Nx\l_@@_graphic_alt_tl{\text_purify:n{#1}}}
+ \define at key{Gin}{alt} {\tl_set:Ne\l_@@_graphic_alt_tl{\text_purify:n{#1}}}
\define at key{Gin}{artifact}[]
{
\bool_set_true:N \l_@@_graphic_artifact_bool
@@ -467,7 +467,7 @@
}
\define at key{Gin}{actualtext}
{
- \tl_set:Nx\l_@@_graphic_actual_tl{\text_purify:n{#1}}
+ \tl_set:Ne\l_@@_graphic_actual_tl{\text_purify:n{#1}}
\bool_set_false:N \l_@@_graphic_BBox_bool
}
\define at key{Gin}{correct-BBox}
@@ -498,7 +498,7 @@
\keys_define:nn{tag/picture}
{
,alt .code:n =
- {\tl_set:Nx\l_@@_graphic_alt_tl{\text_purify:n{#1}}}
+ {\tl_set:Ne\l_@@_graphic_alt_tl{\text_purify:n{#1}}}
,artifact .code:n =
{
\bool_set_true:N \l_@@_graphic_artifact_bool
@@ -506,7 +506,7 @@
}
,actualtext .code:n =
{
- \tl_set:Nx\l_@@_graphic_actual_tl{\text_purify:n{#1}}
+ \tl_set:Ne\l_@@_graphic_actual_tl{\text_purify:n{#1}}
\bool_set_false:N \l_@@_graphic_BBox_bool
}
,correct-BBox .code:n =
@@ -630,7 +630,7 @@
(\l_@@_graphic_uy_fp-\l_@@_graphic_ly_fp-\l_@@_graphic_trim_ly_fp)
* (-\l_@@_graphic_sin_fp)
}
- \tl_gset:Nx\g_@@_graphic_lx_tl
+ \tl_gset:Ne\g_@@_graphic_lx_tl
{
\fp_eval:n
{
@@ -645,7 +645,7 @@
+\l_@@_graphic_trim_lx_fp
}
}
- \tl_gset:Nx\g_@@_graphic_ux_tl
+ \tl_gset:Ne\g_@@_graphic_ux_tl
{
\fp_eval:n
{
@@ -689,7 +689,7 @@
(\l_@@_graphic_uy_fp-\l_@@_graphic_ly_fp-\l_@@_graphic_trim_ly_fp)
* \l_@@_graphic_cos_fp
}
- \tl_gset:Nx\g_@@_graphic_ly_tl
+ \tl_gset:Ne\g_@@_graphic_ly_tl
{
\fp_eval:n
{
@@ -703,7 +703,7 @@
+ \l_@@_graphic_ly_fp + \l_@@_graphic_trim_ly_fp
}
}
- \tl_gset:Nx\g_@@_graphic_uy_tl
+ \tl_gset:Ne\g_@@_graphic_uy_tl
{
\fp_eval:n
{
@@ -729,7 +729,7 @@
{
\bool_if:NT\l_@@_graphic_bboxcorr_bool
{
- \tl_set:Nx #1
+ \tl_set:Ne #1
{
\fp_eval:n
{
@@ -738,7 +738,7 @@
\dim_to_decimal_in_bp:n {\seq_item:Nn \l_@@_graphic_bboxcorr_seq {1} }
}
}
- \tl_set:Nx #2
+ \tl_set:Ne #2
{
\fp_eval:n
{
@@ -747,7 +747,7 @@
\dim_to_decimal_in_bp:n {\seq_item:Nn \l_@@_graphic_bboxcorr_seq {2} }
}
}
- \tl_set:Nx #3
+ \tl_set:Ne #3
{
\fp_eval:n
{
@@ -756,7 +756,7 @@
\dim_to_decimal_in_bp:n {\seq_item:Nn \l_@@_graphic_bboxcorr_seq {3} }
}
}
- \tl_set:Nx #4
+ \tl_set:Ne #4
{
\fp_eval:n
{
@@ -788,19 +788,19 @@
\__tag_graphic_get_scale:
\@@_graphic_get_trim:
\int_gincr:N\g_@@_graphic_int
- \tl_set:Nx\l_@@_graphic_currentlabel_tl {_@@_graphic_\int_use:N \g_@@_graphic_int}
+ \tl_set:Ne\l_@@_graphic_currentlabel_tl {_@@_graphic_\int_use:N \g_@@_graphic_int}
\@@_graphic_savepos:e { \l_@@_graphic_currentlabel_tl }
- \tl_gset:Nx\g_@@_graphic_lx_tl
+ \tl_gset:Ne\g_@@_graphic_lx_tl
{
\dim_to_decimal_in_bp:n
{ \property_ref:een {\l_@@_graphic_currentlabel_tl}{xpos}{0}sp }
}
- \tl_gset:Nx\g_@@_graphic_ly_tl
+ \tl_gset:Ne\g_@@_graphic_ly_tl
{
\dim_to_decimal_in_bp:n
{ \property_ref:een {\l_@@_graphic_currentlabel_tl}{ypos}{0}sp }
}
- \tl_gset:Nx\g_@@_graphic_ux_tl
+ \tl_gset:Ne\g_@@_graphic_ux_tl
{
\fp_eval:n
{
@@ -809,7 +809,7 @@
\dim_to_decimal_in_bp:n { \Gin at req@width }
}
}
- \tl_gset:Nx\g_@@_graphic_uy_tl
+ \tl_gset:Ne\g_@@_graphic_uy_tl
{
\fp_eval:n
{
@@ -823,7 +823,7 @@
% \begin{macrocode}
\legacy_if:nF {Gin at clip}
{
- \tl_gset:Nx\g_@@_graphic_ux_tl
+ \tl_gset:Ne\g_@@_graphic_ux_tl
{
\fp_eval:n
{
@@ -832,7 +832,7 @@
\l_@@_graphic_trim_ux_fp
}
}
- \tl_gset:Nx\g_@@_graphic_lx_tl
+ \tl_gset:Ne\g_@@_graphic_lx_tl
{
\fp_eval:n
{
@@ -841,7 +841,7 @@
\l_@@_graphic_trim_lx_fp
}
}
- \tl_gset:Nx\g_@@_graphic_uy_tl
+ \tl_gset:Ne\g_@@_graphic_uy_tl
{
\fp_eval:n
{
@@ -850,7 +850,7 @@
\l_@@_graphic_trim_uy_fp
}
}
- \tl_gset:Nx\g_@@_graphic_ly_tl
+ \tl_gset:Ne\g_@@_graphic_ly_tl
{
\fp_eval:n
{
@@ -928,26 +928,26 @@
}
{
\int_gincr:N\g_@@_graphic_int
- \tl_set:Nx\l_@@_graphic_currentlabel_tl {_@@_graphic_\int_use:N \g_@@_graphic_int}
+ \tl_set:Ne\l_@@_graphic_currentlabel_tl {_@@_graphic_\int_use:N \g_@@_graphic_int}
\@@_graphic_savepos:e { \l_@@_graphic_currentlabel_tl }
- \tl_gset:Nx \g_@@_graphic_lx_tl
+ \tl_gset:Ne \g_@@_graphic_lx_tl
{
\dim_to_decimal_in_bp:n
{ \property_ref:een {\l_@@_graphic_currentlabel_tl}{xpos}{0}sp }
}
- \tl_gset:Nx \g_@@_graphic_ly_tl
+ \tl_gset:Ne \g_@@_graphic_ly_tl
{
\dim_to_decimal_in_bp:n
{ \property_ref:een {\l_@@_graphic_currentlabel_tl}{ypos}{0}sp - \dp\@picbox }
}
- \tl_gset:Nx \g_@@_graphic_ux_tl
+ \tl_gset:Ne \g_@@_graphic_ux_tl
{
\dim_to_decimal_in_bp:n
{
\g_@@_graphic_lx_tl bp + \wd\@picbox
}
}
- \tl_gset:Nx \g_@@_graphic_uy_tl
+ \tl_gset:Ne \g_@@_graphic_uy_tl
{
\dim_to_decimal_in_bp:n
{
More information about the latex3-commits
mailing list.