Skip to content

Commit

Permalink
Merge branch 'ltmarks-multicol' of https://github.com/latex3/latex2e
Browse files Browse the repository at this point in the history
…into ltmarks-multicol
  • Loading branch information
FrankMittelbach committed Nov 16, 2024
2 parents e82f1f0 + 6810b11 commit 58bed01
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion base/ltmarks.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@
% \end{macrocode}
%
% All marks will have an identification in form of a number that is
% incremented each time an mark insertion happens and therefore the
% incremented each time a mark insertion happens and therefore the
% initial empty values should have that too, so that data extraction
% is going to be uniform.
% \changes{v1.0g}{2024/05/31}{Initialize all marks with an id, use
Expand Down
16 changes: 8 additions & 8 deletions required/tools/multicol.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
% \begin{multicols}{3}[\section*{Preface to versions 1.9 + 2.0}]
%
% Version 1.9 added tagging support and also a number of smaller
% enhancements, such as as and optional argument to
% enhancements, such as an optional argument to
% \cs{columnbreak} to allow for conditional breaks instead of
% forced ones. The min column depth was also made customizable
% (previously it was hardwired to the depth of \enquote{p}) to support
Expand Down Expand Up @@ -1783,7 +1783,7 @@
\global\setbox\mc@boxedresult\vbox{%
% \end{macrocode}
% We first update the mark structures and collect all marks that
% need reinsertion once \mc{} has finished. The we output the boxed
% need reinsertion once \mc{} has finished. Then we output the boxed
% columns and finally we reinsert the marks.
% \changes{v2.0a}{2024/11/10}{Use new mark mechanism}
% \begin{macrocode}
Expand Down Expand Up @@ -3755,7 +3755,7 @@
%
% \section{Further extensions}
%
% This section does contain code for extensions added to this package
% This section contains code for extensions added to this package
% over time. Not all of them may be active, some might sit dormant and
% wait for being activated in some later release.
%
Expand Down Expand Up @@ -4376,8 +4376,8 @@
% \end{macrocode}
% It might be possible that there was a previous \mc{} (either
% before the current one, or a boxed one inside) and that one might
% had more columns than the current one. If so we should make these
% column structures am error as they are no longer valid (or at
% have had more columns than the current one. If so, we should make these
% column structures an error as they are no longer valid (or at
% least empty them, not sure what is better).
% \begin{macrocode}
\int_step_inline:nnn {\col@number + 1} { \g_@@_curr_col_int }
Expand Down Expand Up @@ -4598,7 +4598,7 @@
%
%
% \begin{macro}{\leftmark,\rightmark}
% We change the legacy \cs{leftmark} and \cs{rightmark} to the use
% We change the legacy \cs{leftmark} and \cs{rightmark} to use
% the new mark mechanism. For now we do this only if pkg{multicol}
% is loaded, but eventually this will move to the kernel which then
% also simplifies the definitions for \cs{markboth} and friends.
Expand Down Expand Up @@ -4634,7 +4634,7 @@
% }
% \end{macrocode}
%
% This one has also been moved to the development %kernel
% This one has also been moved to the development kernel
% \begin{macrocode}
%\str_if_exist:cF { l__socket_tagsupport/page@sofar }
% {
Expand All @@ -4645,7 +4645,7 @@
% The plug definition for now just implements the old interface
% currently used by tagpdf. This needs to change and \cs{@mult@ptagging@hook}
% replaced by directly using the socket/plug.
% \changes{v2.0a}{2024/11/12}{Addedd tagging socket}
% \changes{v2.0a}{2024/11/12}{Added tagging socket}
% \begin{macrocode}
\NewSocketPlug {tagsupport/page@sofar}{default}
{
Expand Down

0 comments on commit 58bed01

Please sign in to comment.