[latex3-commits] [git/LaTeX3-latex3-latex2e] gh836: __mark -> @@ and other minor fixes (dabd1b45)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : gh836
Link       : https://github.com/latex3/latex2e/commit/dabd1b4569a916f0d56531b060406e55caafe9f4

>---------------------------------------------------------------

commit dabd1b4569a916f0d56531b060406e55caafe9f4
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Wed Jun 1 23:33:33 2022 -0300

    __mark -> @@ and other minor fixes


>---------------------------------------------------------------

dabd1b4569a916f0d56531b060406e55caafe9f4
 base/ltmarks.dtx | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/base/ltmarks.dtx b/base/ltmarks.dtx
index 2a6270da..3dc4b493 100644
--- a/base/ltmarks.dtx
+++ b/base/ltmarks.dtx
@@ -826,23 +826,23 @@
       \dim_set_eq:NN \tex_vfuzz:D         \c_max_dim
 %    \end{macrocode}
 %    There is a further complication: if the region contains infinite
-%    shrinking glue then a \cs{vsplit} operation will balk with a
+%    shrinking glue then a \tn{vsplit} operation will balk with a
 %    low-level error. Now pages or columns, which are our main concern here, can't
 %    have such infinite shrinkage if they are cut straight from the
-%    galley, however the use of \cs{enlargethispage} actually does add
+%    galley, however the use of \tn{enlargethispage} actually does add
 %    some at the very bottom (and also wraps the whole page into a box
 %    by itself, so if we leave it this way then a) we get this error
 %    and b) we don't see any marks because they are hidden one level
 %    down).
 %      
 %    Another possible issue are packages or user code that place stray
-%    \cs{vbox} directly into the main galley (and example is
-%    \pkg{marginnote} that attaches its marginals in this way. If such
+%    \tn{vbox}es directly into the main galley (an example is
+%    \pkg{marginnote} that attaches its marginals in this way). If such
 %    boxes end up as the last item on the page we should not unpack
 %    them.
 %
 %    We therefore do an \tn{unskip} to get rid of that glue if present and
-%    also check if we have then a \cs{vbox} as the last item and if so
+%    also check if we have then a \tn{vbox} as the last item and if so
 %    unpack that too, but only under certain conditions, see
 %    below. All this is temporary, just for getting the
 %    marks out, so it doesn't affect the final page production.
@@ -867,35 +867,36 @@
 %    After having removed the last box from the current list (if there
 %    was one)
 %    we check if the list is now empty. If not, the the last box is
-%    definitely not the one from \cs{enlargethispage} and so we can
+%    definitely not the one from \tn{enlargethispage} and so we can
 %    and should leave it alone. Otherwise we check if this last box is
-%    a \cs{vbox}.
+%    a \tn{vbox}.
 % \changes{v1.0d}{2022/06/01}{Extend the logic for detecting the marks
 %    in the box (gh/836)}
 %    \begin{macrocode}
           \int_compare:nNnT \tex_lastnodetype:D < 0
-             {
-               \box_if_vertical:NT \l__mark_box
-                   {
+            {
+              \box_if_vertical:NT \l_@@_box
+                {
 %    \end{macrocode}
 %    If it is we do a further test and reset the \cs{l_@@_box}
-%    to check if it contains infinite shrinkable glue.
+%    to check if it contains infinitely shrinkable glue.
 %    \begin{macrocode}
-                     \vbox_set_to_ht:Nnn \l__mark_box { -.5\c_max_dim }
-                          { \vbox_unpack:N \l__mark_box
-                            \tex_kern:D \c_zero_dim % ensure that box
-                                                    % is not empty
-                          }
+                  \vbox_set_to_ht:Nnn \l_@@_box { -.5\c_max_dim }
+                    {
+                      \vbox_unpack:N \l_@@_box
+                      \tex_kern:D \c_zero_dim % ensure that box
+                                              % is not empty
+                    }
 %    \end{macrocode}
 %    If not, then we unpack it, if yes we still ignore it for the process of
 %    mark extraction. We do not generate an error though, because in all
 %    likelihood this is an ordinary box like a marginal that does
-%    contain something like \cs{vss}.
+%    contain something like \tn{vss}.
 %    \begin{macrocode}
-                     \int_compare:nNnT \tex_badness:D > 0
-                         { \vbox_unpack:N \l__mark_box }
+                    \int_compare:nNnT \tex_badness:D > 0
+                      { \vbox_unpack:N \l_@@_box }
                   }
-             }
+            }
 %    \end{macrocode}
 %    If it wasn't a vbox, it was either an hbox or there was no box.
 %    Given that we are only interested in the marks we don't need put