[latex3-commits] [git/LaTeX3-latex3-latex3] clear-drop: Rename \hbox_unpack_clear:N as _drop (b8b61d5)
Joseph Wright
joseph.wright at morningstar2.co.uk
Thu Jan 17 21:46:01 CET 2019
Repository : https://github.com/latex3/latex3
On branch : clear-drop
Link : https://github.com/latex3/latex3/commit/b8b61d516e3000ac37727ae75464dc81170ec5cb
>---------------------------------------------------------------
commit b8b61d516e3000ac37727ae75464dc81170ec5cb
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Thu Jan 17 20:17:26 2019 +0000
Rename \hbox_unpack_clear:N as _drop
>---------------------------------------------------------------
b8b61d516e3000ac37727ae75464dc81170ec5cb
l3kernel/l3box.dtx | 40 +++++++++++++++++++------------
l3kernel/l3doc.dtx | 4 ++--
l3kernel/testfiles/m3box002.lvt | 4 ++--
l3kernel/testfiles/m3expl001.luatex.tlg | 6 +++--
l3kernel/testfiles/m3expl001.ptex.tlg | 6 +++--
l3kernel/testfiles/m3expl001.tlg | 6 +++--
l3kernel/testfiles/m3expl001.uptex.tlg | 6 +++--
l3kernel/testfiles/m3expl001.xetex.tlg | 6 +++--
l3kernel/testfiles/m3expl003.luatex.tlg | 6 +++--
l3kernel/testfiles/m3expl003.ptex.tlg | 6 +++--
l3kernel/testfiles/m3expl003.tlg | 6 +++--
l3kernel/testfiles/m3expl003.uptex.tlg | 6 +++--
l3kernel/testfiles/m3expl003.xetex.tlg | 6 +++--
l3trial/l3tree/l3tree.dtx | 10 ++++----
l3trial/xfont/xfss.dtx | 2 +-
15 files changed, 75 insertions(+), 45 deletions(-)
diff --git a/l3kernel/l3box.dtx b/l3kernel/l3box.dtx
index 7cd91f3..b031bac 100644
--- a/l3kernel/l3box.dtx
+++ b/l3kernel/l3box.dtx
@@ -417,18 +417,6 @@
% \end{texnote}
% \end{function}
%
-% \begin{function}{\hbox_unpack_clear:N, \hbox_unpack_clear:c}
-% \begin{syntax}
-% \cs{hbox_unpack_clear:N} \meta{box}
-% \end{syntax}
-% Unpacks the content of the horizontal \meta{box}, retaining any stretching
-% or shrinking applied when the \meta{box} was set. The \meta{box} is
-% then cleared globally.
-% \begin{texnote}
-% This is the \TeX{} primitive \tn{unhbox}.
-% \end{texnote}
-% \end{function}
-%
% \section{Vertical mode boxes}
%
% Vertical boxes inherit their baseline from their contents. The
@@ -639,6 +627,19 @@
% then drops \meta{box_2}.
% \end{function}
%
+% \begin{function}[added = 2019-01-17]
+% {\hbox_unpack_drop:N, \hbox_unpack_drop:c}
+% \begin{syntax}
+% \cs{hbox_unpack_drop:N} \meta{box}
+% \end{syntax}
+% Unpacks the content of the horizontal \meta{box}, retaining any stretching
+% or shrinking applied when the \meta{box} was set. The original \meta{box}
+% is then dropped.
+% \begin{texnote}
+% This is the \TeX{} primitive \tn{unhbox}.
+% \end{texnote}
+% \end{function}
+%
% \section{Affine transformations}
%
% Affine transformations are changes which (informally) preserve straight
@@ -1357,14 +1358,14 @@
% \end{macro}
%
% \begin{macro}{\hbox_unpack:N, \hbox_unpack:c}
-% \begin{macro}{\hbox_unpack_clear:N, \hbox_unpack_clear:c}
+% \begin{macro}{\hbox_unpack_drop:N, \hbox_unpack_drop:c}
% \testfile*
% Unpacking a box and if requested also clear it.
% \begin{macrocode}
\cs_new_eq:NN \hbox_unpack:N \tex_unhcopy:D
-\cs_new_eq:NN \hbox_unpack_clear:N \tex_unhbox:D
+\cs_new_eq:NN \hbox_unpack_drop:N \tex_unhbox:D
\cs_generate_variant:Nn \hbox_unpack:N { c }
-\cs_generate_variant:Nn \hbox_unpack_clear:N { c }
+\cs_generate_variant:Nn \hbox_unpack_drop:N { c }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2135,6 +2136,15 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\hbox_unpack_clear:N, \hbox_unpack_clear:c}
+% \begin{macrocode}
+\__kernel_patch_deprecation:nnNNpn { 2020-12-31 } { \hbox_unpack_drop:N }
+\cs_new_protected:Npn \hbox_unpack_clear:N
+ { \hbox_unpack_drop:N }
+\cs_generate_variant:Nn \hbox_unpack_clear:N { c }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macrocode}
%</initex|package>
% \end{macrocode}
diff --git a/l3kernel/l3doc.dtx b/l3kernel/l3doc.dtx
index 1502cf7..8e511c7 100644
--- a/l3kernel/l3doc.dtx
+++ b/l3kernel/l3doc.dtx
@@ -2986,7 +2986,7 @@ and all files in that bundle must be distributed together.
{
\llap
{
- \hbox_unpack_clear:N \l_@@_macro_index_box
+ \hbox_unpack_drop:N \l_@@_macro_index_box
\vtop to \baselineskip
{
\vbox_unpack_clear:N \l_@@_macro_box
@@ -3052,7 +3052,7 @@ and all files in that bundle must be distributed together.
\@@_if_macro_internal:nF {#1}
{ \seq_gput_right:Nn \g_doc_macros_seq {#1} }
\hbox_set:Nw \l_@@_macro_index_box
- \hbox_unpack_clear:N \l_@@_macro_index_box
+ \hbox_unpack_drop:N \l_@@_macro_index_box
\int_gincr:N \c at CodelineNo
\@@_special_index:nn {#1} { main }
\int_gdecr:N \c at CodelineNo
diff --git a/l3kernel/testfiles/m3box002.lvt b/l3kernel/testfiles/m3box002.lvt
index f3af37b..ab1e11a 100644
--- a/l3kernel/testfiles/m3box002.lvt
+++ b/l3kernel/testfiles/m3box002.lvt
@@ -70,8 +70,8 @@
\box_show:N \l_tempa_box
\box_show:N \l_tempb_box
\group_begin:
- \hbox_unpack_clear:N \l_tempa_box
- \hbox_unpack_clear:c {l_tempb_box}
+ \hbox_unpack_drop:N \l_tempa_box
+ \hbox_unpack_drop:c {l_tempb_box}
\box_show:N \l_tempa_box
\box_show:N \l_tempb_box
\group_end:
diff --git a/l3kernel/testfiles/m3expl001.luatex.tlg b/l3kernel/testfiles/m3expl001.luatex.tlg
index 3338ba4..7112263 100644
--- a/l3kernel/testfiles/m3expl001.luatex.tlg
+++ b/l3kernel/testfiles/m3expl001.luatex.tlg
@@ -5160,9 +5160,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5262,6 +5262,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.ptex.tlg b/l3kernel/testfiles/m3expl001.ptex.tlg
index d8d69eb..487134f 100644
--- a/l3kernel/testfiles/m3expl001.ptex.tlg
+++ b/l3kernel/testfiles/m3expl001.ptex.tlg
@@ -5456,9 +5456,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5558,6 +5558,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.tlg b/l3kernel/testfiles/m3expl001.tlg
index aafec6a..c4d5b8e 100644
--- a/l3kernel/testfiles/m3expl001.tlg
+++ b/l3kernel/testfiles/m3expl001.tlg
@@ -5456,9 +5456,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5558,6 +5558,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.uptex.tlg b/l3kernel/testfiles/m3expl001.uptex.tlg
index 040e358..3735173 100644
--- a/l3kernel/testfiles/m3expl001.uptex.tlg
+++ b/l3kernel/testfiles/m3expl001.uptex.tlg
@@ -5453,9 +5453,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5555,6 +5555,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl001.xetex.tlg b/l3kernel/testfiles/m3expl001.xetex.tlg
index acf118f..742abcf 100644
--- a/l3kernel/testfiles/m3expl001.xetex.tlg
+++ b/l3kernel/testfiles/m3expl001.xetex.tlg
@@ -5171,9 +5171,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5273,6 +5273,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.luatex.tlg b/l3kernel/testfiles/m3expl003.luatex.tlg
index 3338ba4..7112263 100644
--- a/l3kernel/testfiles/m3expl003.luatex.tlg
+++ b/l3kernel/testfiles/m3expl003.luatex.tlg
@@ -5160,9 +5160,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5262,6 +5262,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.ptex.tlg b/l3kernel/testfiles/m3expl003.ptex.tlg
index d8d69eb..487134f 100644
--- a/l3kernel/testfiles/m3expl003.ptex.tlg
+++ b/l3kernel/testfiles/m3expl003.ptex.tlg
@@ -5456,9 +5456,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5558,6 +5558,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.tlg b/l3kernel/testfiles/m3expl003.tlg
index aafec6a..c4d5b8e 100644
--- a/l3kernel/testfiles/m3expl003.tlg
+++ b/l3kernel/testfiles/m3expl003.tlg
@@ -5456,9 +5456,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5558,6 +5558,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.uptex.tlg b/l3kernel/testfiles/m3expl003.uptex.tlg
index 040e358..3735173 100644
--- a/l3kernel/testfiles/m3expl003.uptex.tlg
+++ b/l3kernel/testfiles/m3expl003.uptex.tlg
@@ -5453,9 +5453,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5555,6 +5555,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3kernel/testfiles/m3expl003.xetex.tlg b/l3kernel/testfiles/m3expl003.xetex.tlg
index acf118f..742abcf 100644
--- a/l3kernel/testfiles/m3expl003.xetex.tlg
+++ b/l3kernel/testfiles/m3expl003.xetex.tlg
@@ -5171,9 +5171,9 @@ Defining \hbox_to_zero:n on line ...
Defining \hbox_overlap_left:n on line ...
Defining \hbox_overlap_right:n on line ...
Defining \hbox_unpack:N on line ...
-Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_drop:N on line ...
Defining \hbox_unpack:c on line ...
-Defining \hbox_unpack_clear:c on line ...
+Defining \hbox_unpack_drop:c on line ...
Defining \vbox:n on line ...
Defining \vbox_top:n on line ...
Defining \vbox_to_ht:nn on line ...
@@ -5273,6 +5273,8 @@ Defining \box_set_eq_clear:cc on line ...
Defining \box_gset_eq_clear:cN on line ...
Defining \box_gset_eq_clear:Nc on line ...
Defining \box_gset_eq_clear:cc on line ...
+Defining \hbox_unpack_clear:N on line ...
+Defining \hbox_unpack_clear:c on line ...
Defining \color_group_begin: on line ...
Defining \color_group_end: on line ...
Defining \color_ensure_current: on line ...
diff --git a/l3trial/l3tree/l3tree.dtx b/l3trial/l3tree/l3tree.dtx
index 869c002..5573aca 100644
--- a/l3trial/l3tree/l3tree.dtx
+++ b/l3trial/l3tree/l3tree.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File l3tree.dtx (C) Copyright 2012-2014,2016-2018 The LaTeX3 Project
+%% File l3tree.dtx (C) Copyright 2012-2014,2016-2019 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -204,7 +204,7 @@
\tex_setbox:D #1 \tex_hbox:D \c_group_begin_token
\q_stop
\tex_everyhbox:D { }
- \hbox_unpack_clear:N #1
+ \hbox_unpack_drop:N #1
}
\cs_new_protected:Npn \tree_gedit:Nw #1
{
@@ -212,7 +212,7 @@
\tex_global:D \tex_setbox:D #1 \tex_hbox:D \c_group_begin_token
\q_stop
\tex_everyhbox:D { }
- \hbox_unpack_clear:N #1
+ \hbox_unpack_drop:N #1
}
% \end{macrocode}
% \end{macro}
@@ -311,7 +311,7 @@
{
\tex_setbox:D \l_tree_first_box \tex_lastbox:D
\if_hbox:N \l_tree_first_box
- \hbox_unpack_clear:N \l_tree_first_box
+ \hbox_unpack_drop:N \l_tree_first_box
\else:
\if_int_compare:w \tex_ht:D \l_tree_first_box = 0 \exp_stop_f:
\exp_after:wN \exp_after:wN \exp_after:wN \use_none:n
@@ -403,7 +403,7 @@
\if_box_empty:N \l_tree_first_box
\exp_after:wN \use_none:n
\else:
- \hbox_unpack_clear:N \l_tree_first_box
+ \hbox_unpack_drop:N \l_tree_first_box
\fi:
\tree_put_loop:
}
diff --git a/l3trial/xfont/xfss.dtx b/l3trial/xfont/xfss.dtx
index e58a6c5..0bec7af 100644
--- a/l3trial/xfont/xfss.dtx
+++ b/l3trial/xfont/xfss.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-%% File xfss.dtx Copyright (C) 2011,2012,2013,2015-2018 The LaTeX3 Project
+%% File xfss.dtx Copyright (C) 2011,2012,2013,2015-2019 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
More information about the latex3-commits
mailing list