[latex3-commits] [latex3/latex3] main: Shorten scratch box names (baa99e8cb)
github at latex-project.org
github at latex-project.org
Sun Nov 5 21:54:26 CET 2023
Repository : https://github.com/latex3/latex3
On branch : main
Link : https://github.com/latex3/latex3/commit/baa99e8cbfa7b730ed8c14711c704068e28ff04d
>---------------------------------------------------------------
commit baa99e8cbfa7b730ed8c14711c704068e28ff04d
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Nov 5 20:54:26 2023 +0000
Shorten scratch box names
>---------------------------------------------------------------
baa99e8cbfa7b730ed8c14711c704068e28ff04d
l3trial/xbox/testfiles/xbox000.tlg | 4 +-
l3trial/xbox/xbox.dtx | 82 +++++++++++++++++++-------------------
2 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/l3trial/xbox/testfiles/xbox000.tlg b/l3trial/xbox/testfiles/xbox000.tlg
index 7c8fb31ab..a16baede0 100644
--- a/l3trial/xbox/testfiles/xbox000.tlg
+++ b/l3trial/xbox/testfiles/xbox000.tlg
@@ -3,7 +3,7 @@ Don't change this file in any respect.
Author: Bruno Le Floch
(xbox.sty
Package: xbox ....-..-.. L3 Experimental document level boxes
-\l__xbox_internal_box=\box...
+\l__xbox_tmp_box=\box...
\l__xbox_height_dim=\dimen...
\l__xbox_depth_dim=\dimen...
\l__xbox_width_dim=\dimen...
@@ -11,7 +11,7 @@ Package: xbox ....-..-.. L3 Experimental document level boxes
\l__xbox_x_dim=\dimen...
\l__xbox_y_dim=\dimen...
\g_xbox_lr_box=\box...
-\l__hbox_internal_box=\box...
+\l__hbox_tmp_box=\box...
! LaTeX cmd Error: Command '\clap' already defined.
For immediate help type H <return>.
...
diff --git a/l3trial/xbox/xbox.dtx b/l3trial/xbox/xbox.dtx
index 3ac0b2097..fdf7efd1f 100644
--- a/l3trial/xbox/xbox.dtx
+++ b/l3trial/xbox/xbox.dtx
@@ -633,10 +633,10 @@
%
% \subsection{Setting up to measure natural width}
%
-% \begin{variable}{\l_@@_internal_box}
+% \begin{variable}{\l_@@_tmp_box}
% Internal box used to typeset material for measuring up.
% \begin{macrocode}
-\box_new:N \l_@@_internal_box
+\box_new:N \l_@@_tmp_box
% \end{macrocode}
% \end{variable}
%
@@ -649,7 +649,7 @@
\cs_new_protected:Npn \@@_via_internal_box:Nnn #1#2#3
{
\group_begin:
- #1 \l_@@_internal_box {#2}
+ #1 \l_@@_tmp_box {#2}
\@@_document_names:
#3
\group_end:
@@ -668,9 +668,9 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_document_names:
{
- \dim_set:Nn \l_@@_height_dim { \box_ht:N \l_@@_internal_box }
- \dim_set:Nn \l_@@_depth_dim { \box_dp:N \l_@@_internal_box }
- \dim_set:Nn \l_@@_width_dim { \box_wd:N \l_@@_internal_box }
+ \dim_set:Nn \l_@@_height_dim { \box_ht:N \l_@@_tmp_box }
+ \dim_set:Nn \l_@@_depth_dim { \box_dp:N \l_@@_tmp_box }
+ \dim_set:Nn \l_@@_width_dim { \box_wd:N \l_@@_tmp_box }
\dim_set:Nn \l_@@_totalheight_dim
{ \l_@@_height_dim + \l_@@_depth_dim }
\cs_set_eq:NN \height \l_@@_height_dim
@@ -835,7 +835,7 @@
\hbox_to_wd:nn {#1}
{
\@@_set_position:n {#2}
- \@@_hposition:n { \hbox_unpack_drop:N \l_@@_internal_box }
+ \@@_hposition:n { \hbox_unpack_drop:N \l_@@_tmp_box }
}
}
}
@@ -858,7 +858,7 @@
\@@_vposition:n
{
\hbox_to_wd:nn {#1}
- { \@@_hposition:n { \hbox_unpack_drop:N \l_@@_internal_box } }
+ { \@@_hposition:n { \hbox_unpack_drop:N \l_@@_tmp_box } }
}
\__kernel_kern:n { 0pt }
}
@@ -918,7 +918,7 @@
{ t } { \vbox_top:n }
}
{ \@@_parbox_vcenter:n }
- { \vbox_unpack_drop:N \l_@@_internal_box }
+ { \vbox_unpack_drop:N \l_@@_tmp_box }
}
}
\cs_new_protected:Npn \xbox_parbox_to_wd_and_ht:nnnnn #1#2#3#4#5
@@ -945,7 +945,7 @@
{ t } { \xbox_position_top:n }
}
{ \use:n }
- { \vbox_unpack_drop:N \l_@@_internal_box }
+ { \vbox_unpack_drop:N \l_@@_tmp_box }
}
}
}
@@ -993,7 +993,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \xbox_minipage_begin:n #1
{
- \vbox_set:Nw \l_@@_internal_box
+ \vbox_set:Nw \l_@@_tmp_box
\dim_set:Nn \hsize {#1}
\dim_set_eq:NN \textwidth \hsize
\dim_set_eq:NN \columnwidth \hsize
@@ -1015,13 +1015,13 @@
{
\@@_minipage_end:
\xbox_parbox_to_wd:nnn {#1} {#2}
- { \vbox_unpack_drop:N \l_@@_internal_box }
+ { \vbox_unpack_drop:N \l_@@_tmp_box }
}
\cs_new_protected:Npn \xbox_minipage_end:nnnn #1#2#3#4
{
\@@_minipage_end:
\xbox_parbox_to_wd:nnnnn {#1} {#2} {#3} {#4}
- { \vbox_unpack_drop:N \l_@@_internal_box }
+ { \vbox_unpack_drop:N \l_@@_tmp_box }
}
\cs_new_protected:Npn \@@_minipage_end:
{
@@ -1051,22 +1051,22 @@
% \begin{macrocode}
\cs_new_protected:Npn \xbox_raise:nn #1#2
{
- \xbox_raise_with_ht_and_dp:nnnn {#1} { \box_ht:N \l_@@_internal_box }
- { \box_dp:N \l_@@_internal_box } {#2}
+ \xbox_raise_with_ht_and_dp:nnnn {#1} { \box_ht:N \l_@@_tmp_box }
+ { \box_dp:N \l_@@_tmp_box } {#2}
}
\cs_new_protected:Npn \xbox_raise_with_ht:nnn #1#2#3
{
- \xbox_raise_with_ht_and_dp:nnnn {#1} {#2} { \box_dp:N \l_@@_internal_box } {#3}
+ \xbox_raise_with_ht_and_dp:nnnn {#1} {#2} { \box_dp:N \l_@@_tmp_box } {#3}
}
\cs_new_protected:Npn \xbox_raise_with_ht_and_dp:nnnn #1#2#3#4
{
\@@_via_internal_box:Nnn \hbox_set:Nn {#4}
{
- \hbox_set:Nn \l_@@_internal_box
- { \box_move_up:nn {#1} { \box_use_drop:N \l_@@_internal_box } }
- \box_set_ht:Nn \l_@@_internal_box {#2}
- \box_set_dp:Nn \l_@@_internal_box {#3}
- \box_use_drop:N \l_@@_internal_box
+ \hbox_set:Nn \l_@@_tmp_box
+ { \box_move_up:nn {#1} { \box_use_drop:N \l_@@_tmp_box } }
+ \box_set_ht:Nn \l_@@_tmp_box {#2}
+ \box_set_dp:Nn \l_@@_tmp_box {#3}
+ \box_use_drop:N \l_@@_tmp_box
}
}
% \end{macrocode}
@@ -1080,10 +1080,10 @@
%<@@=hbox>
% \end{macrocode}
%
-% \begin{variable}{\l_@@_internal_box}
+% \begin{variable}{\l_@@_tmp_box}
% Internal box used to typeset material for measuring up.
% \begin{macrocode}
-\box_new:N \l_@@_internal_box
+\box_new:N \l_@@_tmp_box
% \end{macrocode}
% \end{variable}
%
@@ -1100,7 +1100,7 @@
\cs_new_protected:Npn \@@_frame:nnn #1#2#3
{
\group_begin:
- \hbox_set:Nn \l_@@_internal_box {#3}
+ \hbox_set:Nn \l_@@_tmp_box {#3}
% \end{macrocode}
% The actual insertion is done such that the content goes in \enquote{behind}
% the rules. That requires a bit of shuffling so that the final box is the
@@ -1110,9 +1110,9 @@
\hbox:n
{
\kern_horizontal:n { #1 + #2 }
- \box_use:N \l_@@_internal_box
- \kern_horizontal:n { -\box_wd:N \l_@@_internal_box - #2 - #1 }
- \box_move_down:nn { \box_dp:N \l_@@_internal_box + #2 + #1 }
+ \box_use:N \l_@@_tmp_box
+ \kern_horizontal:n { -\box_wd:N \l_@@_tmp_box - #2 - #1 }
+ \box_move_down:nn { \box_dp:N \l_@@_tmp_box + #2 + #1 }
{
\vbox:n
{
@@ -1121,14 +1121,14 @@
{
\rule_vertical:n {#1}
\kern_horizontal:n
- { #2 * 2 + \box_wd:N \l_@@_internal_box }
+ { #2 * 2 + \box_wd:N \l_@@_tmp_box }
\vbox:n
{
\kern_vertical:n
{
#2 * 2
- + \box_dp:N \l_@@_internal_box
- + \box_ht:N \l_@@_internal_box
+ + \box_dp:N \l_@@_tmp_box
+ + \box_ht:N \l_@@_tmp_box
}
}
\rule_vertical:n {#1}
@@ -1156,12 +1156,12 @@
\cs_new_protected:Npn \@@_surround:nn #1#2
{
\group_begin:
- \hbox_set:Nn \l_@@_internal_box {#2}
+ \hbox_set:Nn \l_@@_tmp_box {#2}
\hbox:n
{
\box_use_drop:N \l__box_internal_box
- \kern_horizontal:n { -\box_wd:N \l_@@_internal_box - #1 }
- \box_move_down:nn { \box_dp:N \l_@@_internal_box }
+ \kern_horizontal:n { -\box_wd:N \l_@@_tmp_box - #1 }
+ \box_move_down:nn { \box_dp:N \l_@@_tmp_box }
{
\vbox:n
{
@@ -1170,13 +1170,13 @@
\hbox:n
{
\rule_vertical:n {#1}
- \kern_horizontal:n { \box_wd:N \l_@@_internal_box }
+ \kern_horizontal:n { \box_wd:N \l_@@_tmp_box }
\vbox:n
{
\kern_vertical:n
{
- \box_dp:N \l_@@_internal_box
- + \box_ht:N \l_@@_internal_box
+ \box_dp:N \l_@@_tmp_box
+ + \box_ht:N \l_@@_tmp_box
}
}
\rule_vertical:n {#1}
@@ -1203,19 +1203,19 @@
\cs_new_protected:Npn \@@_underline:nnn #1#2#3
{
\group_begin:
- \hbox_set:Nn \l_@@_internal_box {#3}
+ \hbox_set:Nn \l_@@_tmp_box {#3}
\hbox:n
{
- \box_use:N \l_@@_internal_box
- \kern_horizontal:n { -\box_wd:N \l_@@_internal_box }
- \box_move_down:nn { \box_dp:N \l_@@_internal_box + #2 + #1 }
+ \box_use:N \l_@@_tmp_box
+ \kern_horizontal:n { -\box_wd:N \l_@@_tmp_box }
+ \box_move_down:nn { \box_dp:N \l_@@_tmp_box + #2 + #1 }
{
\vbox:n
{
\hbox:n
{
\kern_horizontal:n
- { \box_wd:N \l_@@_internal_box }
+ { \box_wd:N \l_@@_tmp_box }
}
\rule_horizontal:nn {#1} { \c_zero_dim }
}
More information about the latex3-commits
mailing list.